diff options
Diffstat (limited to 'omegalib/omegacalc/src/parser.y')
| -rw-r--r-- | omegalib/omegacalc/src/parser.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/omegalib/omegacalc/src/parser.y b/omegalib/omegacalc/src/parser.y index 7369b94..d365797 100644 --- a/omegalib/omegacalc/src/parser.y +++ b/omegalib/omegacalc/src/parser.y @@ -14,7 +14,7 @@ %{ -#include <basic/Dynamic_Array.h> +#include <basic/DynamicArray.h> #include <basic/Iterator.h> #include <code_gen/code_gen.h> #include <omega_calc/AST.h> @@ -102,8 +102,8 @@ void flushScanBuffer(); Relation * RELATION; tupleDescriptor * TUPLE_DESCRIPTOR; RelTuplePair * REL_TUPLE_PAIR; - Dynamic_Array2<Relation> * RELATION_ARRAY_2D; - Dynamic_Array1<Relation> * RELATION_ARRAY_1D; + DynamicArray2<Relation> * RELATION_ARRAY_2D; + DynamicArray1<Relation> * RELATION_ARRAY_1D; Tuple<std::string> *STRING_TUPLE; std::string *STRING_VALUE; } @@ -407,7 +407,7 @@ inputItem : ';' /*empty*/ } | reachable ';' { flushScanBuffer(); - Dynamic_Array1<Relation> &final = *$1; + DynamicArray1<Relation> &final = *$1; bool any_sat = false; int i,n_nodes = reachable_info->node_names.size(); for(i = 1; i <= n_nodes; i++) @@ -1582,13 +1582,13 @@ exp : COEF {$$ = new Exp($1);} reachable : REACHABLE_FROM nodeNameList nodeSpecificationList { - Dynamic_Array1<Relation> *final = Reachable_Nodes(reachable_info); + DynamicArray1<Relation> *final = Reachable_Nodes(reachable_info); $$ = final; } ; reachable_of : REACHABLE_OF VAR IN nodeNameList nodeSpecificationList { - Dynamic_Array1<Relation> *final = Reachable_Nodes(reachable_info); + DynamicArray1<Relation> *final = Reachable_Nodes(reachable_info); int index = reachable_info->node_names.index(std::string($2)); if (index == 0) { yyerror(std::string("no such node ") + to_string($2)); @@ -1629,7 +1629,7 @@ nodeSpecificationList : OPEN_BRACE realNodeSpecificationList CLOSE_BRACE { int i,j; int n_nodes = reachable_info->node_names.size(); Tuple<int> &arity = reachable_info->node_arity; - Dynamic_Array2<Relation> &transitions = reachable_info->transitions; + DynamicArray2<Relation> &transitions = reachable_info->transitions; /* fixup unspecified transitions to be false */ /* find arity */ @@ -1656,7 +1656,7 @@ nodeSpecificationList : OPEN_BRACE realNodeSpecificationList CLOSE_BRACE { transitions[i][j] = Relation::False(arity[i],arity[j]); /* fixup unused start node positions */ - Dynamic_Array1<Relation> &nodes = reachable_info->start_nodes; + DynamicArray1<Relation> &nodes = reachable_info->start_nodes; for(i = 1; i <= n_nodes; i++) if(nodes[i].is_null()) nodes[i] = Relation::False(arity[i]); |