721 Commits

Author	SHA1	Message	Date
Max Neunhoeffer	462be601cf	Use new Json wrapper class.	2014-07-25 00:32:30 +02:00
Max Neunhoeffer	e6da8c63e2	Change Json wrapper class test.	2014-07-24 23:41:44 +02:00
Jan Steemann	adbda1462a	added AST	2014-07-24 17:16:51 +02:00
Jan Steemann	5d79df9e2f	re-added scopes	2014-07-24 16:39:16 +02:00
Jan Steemann	9d07679f27	error reporting	2014-07-24 14:57:57 +02:00
Jan Steemann	7eb727bd15	Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2	2014-07-24 14:40:06 +02:00
Jan Steemann	0496b06cf9	error reporting	2014-07-24 14:39:59 +02:00
Max Neunhoeffer	00b9106dd3	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2	2014-07-24 14:13:49 +02:00
Max Neunhoeffer	970ad56b2b	Add new node type. appendAsString method missing.	2014-07-24 14:13:34 +02:00
Jan Steemann	1b5c1118bd	Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2	2014-07-24 14:00:19 +02:00
Jan Steemann	e1c7843ecb	parser	2014-07-24 14:00:13 +02:00
Max Neunhoeffer	9b4a56d0d5	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2	2014-07-24 13:51:42 +02:00
Max Neunhoeffer	d9876b1c5a	First draft of infrastructure for ExecutionPlan.	2014-07-24 13:51:21 +02:00
Jan Steemann	be3766e4fa	use parser	2014-07-24 11:59:11 +02:00
Jan Steemann	a2cb09b82c	Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Makefile.files	2014-07-24 11:54:38 +02:00
Jan Steemann	010ae07265	added Parser	2014-07-24 11:53:38 +02:00
Max Neunhoeffer	934c1df189	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Makefile.files	2014-07-24 11:50:48 +02:00
Max Neunhoeffer	97071bcabb	Start ExecutionPlan infrastructure.	2014-07-24 11:50:13 +02:00
Jan Steemann	cdf9ce0002	renaming	2014-07-24 11:45:59 +02:00
Jan Steemann	d3720fe6ba	cxx	2014-07-24 11:22:01 +02:00
Jan Steemann	5e2ac40608	copied query error	2014-07-24 11:18:20 +02:00