Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

some refactoring

This commit is contained in:
Jan Steemann 2012-06-01 18:25:33 +02:00
parent a5807ad832
commit 72e1b17e13
11 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Ahuacatl/ahuacatl-ast-node.c
View File

@ -30,6 +30,7 @@
#include "Ahuacatl/ahuacatl-functions.h"
#include "Ahuacatl/ahuacatl-parser-functions.h"
#include "Ahuacatl/ahuacatl-scope.h"
#include "Ahuacatl/ahuacatl-variable.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros
@ -233,7 +234,7 @@ TRI_aql_node_t* TRI_CreateNodeForAql (TRI_aql_context_t* const context,
}
{
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name);
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name, node);
ADD_MEMBER(variable)
ADD_MEMBER(expression)
}
@ -260,7 +261,7 @@ TRI_aql_node_t* TRI_CreateNodeLetAql (TRI_aql_context_t* const context,
}
{
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name);
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name, node);
ADD_MEMBER(variable)
ADD_MEMBER(expression)
}
@ -305,7 +306,7 @@ TRI_aql_node_t* TRI_CreateNodeCollectAql (TRI_aql_context_t* const context,
ADD_MEMBER(list)
if (name) {
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name);
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name, node);
ADD_MEMBER(variable)
}
@ -365,7 +366,7 @@ TRI_aql_node_t* TRI_CreateNodeAssignAql (TRI_aql_context_t* const context,
CREATE_NODE(AQL_NODE_ASSIGN)
{
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name);
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, name, node);
ADD_MEMBER(variable)
ADD_MEMBER(expression)
}
@ -378,14 +379,15 @@ TRI_aql_node_t* TRI_CreateNodeAssignAql (TRI_aql_context_t* const context,
////////////////////////////////////////////////////////////////////////////////
TRI_aql_node_t* TRI_CreateNodeVariableAql (TRI_aql_context_t* const context,
const char* const name) {
const char* const name,
TRI_aql_node_t* const definingNode) {
CREATE_NODE(AQL_NODE_VARIABLE)
if (!name) {
ABORT_OOM
}
if (!TRI_AddVariableScopeAql(context, name)) {
if (!TRI_AddVariableScopeAql(context, name, definingNode)) {
// duplicate variable name
TRI_SetErrorContextAql(context, TRI_ERROR_QUERY_VARIABLE_REDECLARED, name);
return NULL;
@ -412,9 +414,12 @@ TRI_aql_node_t* TRI_CreateNodeCollectionAql (TRI_aql_context_t* const context,
TRI_SetErrorContextAql(context, TRI_ERROR_QUERY_COLLECTION_NOT_FOUND, name);
return NULL;
}
TRI_AQL_NODE_STRING(node) = (char*) name;
{
TRI_aql_node_t* nameNode = TRI_CreateNodeValueStringAql(context, name);
ADD_MEMBER(nameNode)
}
if (!TRI_AddCollectionAql(context, name)) {
return NULL;
}
@ -752,7 +757,7 @@ TRI_aql_node_t* TRI_CreateNodeSubqueryAql (TRI_aql_context_t* const context,
{
// add the temporary variable
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, TRI_GetNameParseAql(context));
TRI_aql_node_t* variable = TRI_CreateNodeVariableAql(context, TRI_GetNameParseAql(context), node);
ADD_MEMBER(variable)
}
@ -811,8 +816,9 @@ TRI_aql_node_t* TRI_CreateNodeExpandAql (TRI_aql_context_t* const context,
}
{
TRI_aql_node_t* variable1 = TRI_CreateNodeVariableAql(context, varname);
TRI_aql_node_t* variable2 = TRI_CreateNodeVariableAql(context, TRI_GetNameParseAql(context));
// TODO: check if 3rd parameters' values are correct for these
TRI_aql_node_t* variable1 = TRI_CreateNodeVariableAql(context, varname, node);
TRI_aql_node_t* variable2 = TRI_CreateNodeVariableAql(context, TRI_GetNameParseAql(context), node);
ADD_MEMBER(variable1)
ADD_MEMBER(variable2)

3
Ahuacatl/ahuacatl-ast-node.h
View File

@ -337,7 +337,8 @@ TRI_aql_node_t* TRI_CreateNodeParameterAql (TRI_aql_context_t* const,
////////////////////////////////////////////////////////////////////////////////
TRI_aql_node_t* TRI_CreateNodeVariableAql (TRI_aql_context_t* const,
const char* const);
const char* const,
TRI_aql_node_t* const);
////////////////////////////////////////////////////////////////////////////////
/// @brief create an AST collection node

12
Ahuacatl/ahuacatl-codegen.c
View File

@ -1168,7 +1168,9 @@ static void ProcessArgList (TRI_aql_codegen_js_t* const generator,
if (parameter->_type == AQL_NODE_COLLECTION && TRI_ConvertParameterFunctionAql(function, i)) {
// collection arguments will be created as string argument => e.g. "users"
ScopeOutputQuoted(generator, TRI_AQL_NODE_STRING(parameter));
TRI_aql_node_t* nameNode = TRI_AQL_NODE_MEMBER(parameter, 0);
ScopeOutputQuoted(generator, TRI_AQL_NODE_STRING(nameNode));
}
else {
// anything else will be created as is
@ -1226,9 +1228,9 @@ static void ProcessIndexed (TRI_aql_codegen_js_t* const generator,
static void ProcessCollection (TRI_aql_codegen_js_t* const generator,
const TRI_aql_node_t* const node) {
ScopeOutput(generator, "AHUACATL_GET_DOCUMENTS('");
ScopeOutput(generator, TRI_AQL_NODE_STRING(node));
ScopeOutput(generator, "')");
ScopeOutput(generator, "AHUACATL_GET_DOCUMENTS(");
ProcessNode(generator, TRI_AQL_NODE_MEMBER(node, 0));
ScopeOutput(generator, ")");
}
////////////////////////////////////////////////////////////////////////////////
@ -1253,7 +1255,7 @@ static void ProcessHintedCollection (TRI_aql_codegen_js_t* const generator,
variableName = TRI_AQL_NODE_STRING(nameNode);
assert(variableName);
collectionName = TRI_AQL_NODE_STRING(collectionNode);
collectionName = TRI_AQL_NODE_STRING((TRI_AQL_NODE_MEMBER(collectionNode, 0)));
assert(collectionName);
collection = TRI_GetCollectionAql(generator->_context, collectionName);

1
Ahuacatl/ahuacatl-context.c
View File

@ -34,6 +34,7 @@
#include "Ahuacatl/ahuacatl-parser-functions.h"
#include "Ahuacatl/ahuacatl-scope.h"
#include "Ahuacatl/ahuacatl-tree-dump.h"
#include "Ahuacatl/ahuacatl-variable.h"
// -----------------------------------------------------------------------------
// --SECTION-- private macros

1
Ahuacatl/ahuacatl-context.h
View File

@ -40,7 +40,6 @@
#include "Ahuacatl/ahuacatl-error.h"
#include "Ahuacatl/ahuacatl-parser.h"
#include "Ahuacatl/ahuacatl-variable.h"
#ifdef __cplusplus
extern "C" {

14
Ahuacatl/ahuacatl-optimiser.c
View File

@ -538,6 +538,18 @@ TRY_LOOP:
return node;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief optimise a reference expression
////////////////////////////////////////////////////////////////////////////////
static TRI_aql_node_t* OptimiseReference (TRI_aql_context_t* const context,
TRI_aql_node_t* node) {
// TODO: find variable in current symbol table
// follow references until variable declaration is found
// if variable value at source is constant, copy the constant into here as well
return node;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief optimise an arithmetic operation with one operand
////////////////////////////////////////////////////////////////////////////////
@ -915,6 +927,8 @@ static TRI_aql_node_t* OptimiseNode (TRI_aql_context_t* const context,
return OptimiseFilter(context, node);
case AQL_NODE_FCALL:
return OptimiseFcall(context, node);
case AQL_NODE_REFERENCE:
return OptimiseReference(context, node);
default:
break;
}

7
Ahuacatl/ahuacatl-scope.c
View File

@ -26,6 +26,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "Ahuacatl/ahuacatl-scope.h"
#include "Ahuacatl/ahuacatl-variable.h"
// -----------------------------------------------------------------------------
// --SECTION-- private functions
@ -314,7 +315,9 @@ bool TRI_VariableExistsScopeAql (TRI_aql_context_t* const context,
/// @brief push a variable into the current scope's symbol table
////////////////////////////////////////////////////////////////////////////////
bool TRI_AddVariableScopeAql (TRI_aql_context_t* const context, const char* name) {
bool TRI_AddVariableScopeAql (TRI_aql_context_t* const context,
const char* name,
TRI_aql_node_t* const definingNode) {
TRI_aql_variable_t* variable;
TRI_aql_scope_t* scope;
@ -325,7 +328,7 @@ bool TRI_AddVariableScopeAql (TRI_aql_context_t* const context, const char* name
return false;
}
variable = TRI_CreateVariableAql(name);
variable = TRI_CreateVariableAql(name, definingNode);
if (variable == NULL) {
return false;
}

5
Ahuacatl/ahuacatl-scope.h
View File

@ -30,6 +30,7 @@
#include <BasicsC/associative.h>
#include "Ahuacatl/ahuacatl-ast-node.h"
#include "Ahuacatl/ahuacatl-context.h"
#include "Ahuacatl/ahuacatl-log.h"
@ -123,7 +124,9 @@ bool TRI_VariableExistsScopeAql (TRI_aql_context_t* const, const char* const);
/// @brief push a variable into the current scope's symbol table
////////////////////////////////////////////////////////////////////////////////
bool TRI_AddVariableScopeAql (TRI_aql_context_t* const, const char*);
bool TRI_AddVariableScopeAql (TRI_aql_context_t* const,
const char*,
TRI_aql_node_t* const);
////////////////////////////////////////////////////////////////////////////////
/// @}

1
Ahuacatl/ahuacatl-tree-dump.c
View File

@ -138,7 +138,6 @@ static void DumpNode (void* data, const TRI_aql_node_t* const node) {
case AQL_NODE_VARIABLE:
case AQL_NODE_ATTRIBUTE:
case AQL_NODE_COLLECTION:
case AQL_NODE_REFERENCE:
case AQL_NODE_PARAMETER:
case AQL_NODE_ARRAY_ELEMENT:

6
Ahuacatl/ahuacatl-variable.c
View File

@ -40,7 +40,8 @@
/// @brief register a new variable
////////////////////////////////////////////////////////////////////////////////
TRI_aql_variable_t* TRI_CreateVariableAql (const char* const name) {
TRI_aql_variable_t* TRI_CreateVariableAql (const char* const name,
TRI_aql_node_t* const definingNode) {
TRI_aql_variable_t* variable;
variable = (TRI_aql_variable_t*) TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, sizeof(TRI_aql_variable_t), false);
@ -57,6 +58,9 @@ TRI_aql_variable_t* TRI_CreateVariableAql (const char* const name) {
}
variable->_refCount = 0;
variable->_definingNode = definingNode;
assert(definingNode);
return variable;
}

6
Ahuacatl/ahuacatl-variable.h
View File

@ -34,6 +34,8 @@
#include <BasicsC/vector.h>
#include <BasicsC/associative.h>
#include "Ahuacatl/ahuacatl-ast-node.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -54,6 +56,7 @@ extern "C" {
typedef struct TRI_aql_variable_s {
char* _name;
uint32_t _refCount;
TRI_aql_node_t* _definingNode;
}
TRI_aql_variable_t;
@ -74,7 +77,8 @@ TRI_aql_variable_t;
/// @brief register a new variable
////////////////////////////////////////////////////////////////////////////////
TRI_aql_variable_t* TRI_CreateVariableAql (const char* const);
TRI_aql_variable_t* TRI_CreateVariableAql (const char* const,
TRI_aql_node_t* const);
////////////////////////////////////////////////////////////////////////////////
/// @brief free an existing variable