generated files

README

@@ -89,7 +89,7 @@ http://www.arangodb.org/community
 Citing ArangoDB
 
 Please kindly cite ArangoDB in your publications if it helps your research:
-bibtex @misc{ArangoDB2013, Author = {ArangoDB}, Title = { {ArangoDB}: An Open
-Source multi-purpose database supporting flexible data models for documents,
-graphs, and key-values.}, Year = {2013}, Howpublished = {\url{http://
-arangodb.org/} }
+bibtex @misc{ArangoDB2014, Author = {ArangoDB}, Title = { {ArangoDB 2.2}: An
+Open Source multi-purpose database supporting flexible data models for
+documents, graphs, and key-values.}, Year = {2014}, Howpublished = {\url{http:/
+/arangodb.org/} }

arangod/Ahuacatl/ahuacatl-grammar.h

@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,13 +26,13 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
 #ifndef YY_AHUACATL_ARANGOD_AHUACATL_AHUACATL_GRAMMAR_H_INCLUDED
 # define YY_AHUACATL_ARANGOD_AHUACATL_AHUACATL_GRAMMAR_H_INCLUDED
-/* Debug traces.  */
+/* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
@@ -40,105 +40,119 @@
 extern int Ahuacatldebug;
 #endif
 
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    T_END = 0,
-    T_FOR = 258,
-    T_LET = 259,
-    T_FILTER = 260,
-    T_RETURN = 261,
-    T_COLLECT = 262,
-    T_SORT = 263,
-    T_LIMIT = 264,
-    T_ASC = 265,
-    T_DESC = 266,
-    T_IN = 267,
-    T_WITH = 268,
-    T_INTO = 269,
-    T_REMOVE = 270,
-    T_INSERT = 271,
-    T_UPDATE = 272,
-    T_REPLACE = 273,
-    T_NULL = 274,
-    T_TRUE = 275,
-    T_FALSE = 276,
-    T_STRING = 277,
-    T_QUOTED_STRING = 278,
-    T_INTEGER = 279,
-    T_DOUBLE = 280,
-    T_PARAMETER = 281,
-    T_ASSIGN = 282,
-    T_NOT = 283,
-    T_AND = 284,
-    T_OR = 285,
-    T_EQ = 286,
-    T_NE = 287,
-    T_LT = 288,
-    T_GT = 289,
-    T_LE = 290,
-    T_GE = 291,
-    T_PLUS = 292,
-    T_MINUS = 293,
-    T_TIMES = 294,
-    T_DIV = 295,
-    T_MOD = 296,
-    T_EXPAND = 297,
-    T_QUESTION = 298,
-    T_COLON = 299,
-    T_SCOPE = 300,
-    T_RANGE = 301,
-    T_COMMA = 302,
-    T_OPEN = 303,
-    T_CLOSE = 304,
-    T_DOC_OPEN = 305,
-    T_DOC_CLOSE = 306,
-    T_LIST_OPEN = 307,
-    T_LIST_CLOSE = 308,
-    UMINUS = 309,
-    UPLUS = 310,
-    FUNCCALL = 311,
-    REFERENCE = 312,
-    INDEXED = 313
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_END = 0,
+     T_FOR = 258,
+     T_LET = 259,
+     T_FILTER = 260,
+     T_RETURN = 261,
+     T_COLLECT = 262,
+     T_SORT = 263,
+     T_LIMIT = 264,
+     T_ASC = 265,
+     T_DESC = 266,
+     T_IN = 267,
+     T_WITH = 268,
+     T_INTO = 269,
+     T_REMOVE = 270,
+     T_INSERT = 271,
+     T_UPDATE = 272,
+     T_REPLACE = 273,
+     T_NULL = 274,
+     T_TRUE = 275,
+     T_FALSE = 276,
+     T_STRING = 277,
+     T_QUOTED_STRING = 278,
+     T_INTEGER = 279,
+     T_DOUBLE = 280,
+     T_PARAMETER = 281,
+     T_ASSIGN = 282,
+     T_NOT = 283,
+     T_AND = 284,
+     T_OR = 285,
+     T_EQ = 286,
+     T_NE = 287,
+     T_LT = 288,
+     T_GT = 289,
+     T_LE = 290,
+     T_GE = 291,
+     T_PLUS = 292,
+     T_MINUS = 293,
+     T_TIMES = 294,
+     T_DIV = 295,
+     T_MOD = 296,
+     T_EXPAND = 297,
+     T_QUESTION = 298,
+     T_COLON = 299,
+     T_SCOPE = 300,
+     T_RANGE = 301,
+     T_COMMA = 302,
+     T_OPEN = 303,
+     T_CLOSE = 304,
+     T_DOC_OPEN = 305,
+     T_DOC_CLOSE = 306,
+     T_LIST_OPEN = 307,
+     T_LIST_CLOSE = 308,
+     UPLUS = 309,
+     UMINUS = 310,
+     FUNCCALL = 311,
+     REFERENCE = 312,
+     INDEXED = 313
+   };
 #endif
 
-/* Value type.  */
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
-union YYSTYPE
+typedef union YYSTYPE
 {
-#line 26 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1909  */
+/* Line 2058 of yacc.c  */
+#line 26 "arangod/Ahuacatl/ahuacatl-grammar.y"
 
   TRI_aql_node_t* node;
   char* strval;
   bool boolval;
   int64_t intval;
 
-#line 121 "arangod/Ahuacatl/ahuacatl-grammar.h" /* yacc.c:1909  */
-};
+
+/* Line 2058 of yacc.c  */
+#line 124 "arangod/Ahuacatl/ahuacatl-grammar.h"
+} YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
-/* Location type.  */
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
+typedef struct YYLTYPE
 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;
-};
+} YYLTYPE;
+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 
-
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int Ahuacatlparse (void *YYPARSE_PARAM);
+#else
+int Ahuacatlparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
 int Ahuacatlparse (TRI_aql_context_t* const context);
+#else
+int Ahuacatlparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
 #endif /* !YY_AHUACATL_ARANGOD_AHUACATL_AHUACATL_GRAMMAR_H_INCLUDED  */

js/apps/system/aardvark/frontend/js/modules/org/arangodb/aql/functions.js

@@ -172,9 +172,9 @@ var stringifyFunction = function (code, name) {
 ///
 /// @EXAMPLES
 ///
-/// @EXAMPLE_ARANGOSH_OUTPUT{aqlFunctionUnregister}
+/// ```js
 ///   require("org/arangodb/aql/functions").unregister("myfunctions::temperature::celsiustofahrenheit");
-/// @END_EXAMPLE_ARANGOSH_OUTPUT
+/// ```
 /// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
   
@@ -216,11 +216,11 @@ var unregisterFunction = function (name) {
 ///
 /// @EXAMPLES
 ///
-/// @EXAMPLE_ARANGOSH_OUTPUT{aqlFunctionUnregisterGroup}
+/// ```js
 ///   require("org/arangodb/aql/functions").unregisterGroup("myfunctions::temperature");
 ///
 ///   require("org/arangodb/aql/functions").unregisterGroup("myfunctions");
-/// @END_EXAMPLE_ARANGOSH_OUTPUT
+/// ```
 /// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
   
@@ -267,12 +267,12 @@ var unregisterFunctionsGroup = function (group) {
 ///
 /// @EXAMPLES
 ///
-/// @EXAMPLE_ARANGOSH_OUTPUT{aqlFunctionRegister}
+/// ```js
 ///   require("org/arangodb/aql/functions").register("myfunctions::temperature::celsiustofahrenheit", 
 ///   function (celsius) {
 ///     return celsius * 1.8 + 32; 
 ///   });
-/// @END_EXAMPLE_ARANGOSH_OUTPUT
+/// ```
 /// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
   
@@ -358,21 +358,21 @@ var registerFunction = function (name, code, isDeterministic) {
 ///
 /// To list all available user functions:
 ///
-/// @EXAMPLE_ARANGOSH_OUTPUT{aqlFunctionsToArray}
+/// ```js
 ///   require("org/arangodb/aql/functions").toArray();
-/// @END_EXAMPLE_ARANGOSH_OUTPUT
+/// ```
 ///
 /// To list all available user functions in the *myfunctions* namespace:
 ///
-/// @EXAMPLE_ARANGOSH_OUTPUT{aqlFunctionsToArrayPrefix}
+/// ```js
 ///   require("org/arangodb/aql/functions").toArray("myfunctions");
-/// @END_EXAMPLE_ARANGOSH_OUTPUT
+/// ```
 ///
 /// To list all available user functions in the *myfunctions::temperature* namespace:
 ///
-/// @EXAMPLE_ARANGOSH_OUTPUT{aqlFunctionsToArrayList}
+/// ```js
 ///   require("org/arangodb/aql/functions").toArray("myfunctions::temperature");
-/// @END_EXAMPLE_ARANGOSH_OUTPUT
+/// ```
 /// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
   

js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js

@@ -3859,14 +3859,11 @@ var changeEdgeDefinitionsForGraph = function(graph, edgeDefinition, newCollectio
   var graphObj = _graph(graph._key);
   var eDs = graph.edgeDefinitions;
   var gotAHit = false;
-  require("internal").print("Graph: " + graph._key);
 
   //replace edgeDefintion
   eDs.forEach(
     function(eD, id) {
       if(eD.collection === edgeDefinition.collection) {
-        require("internal").print("eD.collection");
-        require("internal").print(eD.collection);
         gotAHit = true;
         oldCollections = _.union(oldCollections, eD.from);
         oldCollections = _.union(oldCollections, eD.to);