From 18644419b50b2b14a24456e0fcdb210f231ee317 Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Sun, 18 Sep 2016 15:16:52 -0600 Subject: doc updated for code_gen --- omegalib/omegacalc/src/parser.l | 2 +- omegalib/omegacalc/src/parser.ll | 2 +- omegalib/omegacalc/src/parser.y | 16 ++++++++-------- omegalib/omegacalc/src/parser.yy | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'omegalib/omegacalc/src') diff --git a/omegalib/omegacalc/src/parser.l b/omegalib/omegacalc/src/parser.l index ac2b448..04933f4 100644 --- a/omegalib/omegacalc/src/parser.l +++ b/omegalib/omegacalc/src/parser.l @@ -4,7 +4,7 @@ #include #include #include -#include +#include using namespace omega; #include "y.tab.h" diff --git a/omegalib/omegacalc/src/parser.ll b/omegalib/omegacalc/src/parser.ll index 86de3a4..e095f24 100755 --- a/omegalib/omegacalc/src/parser.ll +++ b/omegalib/omegacalc/src/parser.ll @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "parser.tab.hh" #include 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 +#include #include #include #include @@ -102,8 +102,8 @@ void flushScanBuffer(); Relation * RELATION; tupleDescriptor * TUPLE_DESCRIPTOR; RelTuplePair * REL_TUPLE_PAIR; - Dynamic_Array2 * RELATION_ARRAY_2D; - Dynamic_Array1 * RELATION_ARRAY_1D; + DynamicArray2 * RELATION_ARRAY_2D; + DynamicArray1 * RELATION_ARRAY_1D; Tuple *STRING_TUPLE; std::string *STRING_VALUE; } @@ -407,7 +407,7 @@ inputItem : ';' /*empty*/ } | reachable ';' { flushScanBuffer(); - Dynamic_Array1 &final = *$1; + DynamicArray1 &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 *final = Reachable_Nodes(reachable_info); + DynamicArray1 *final = Reachable_Nodes(reachable_info); $$ = final; } ; reachable_of : REACHABLE_OF VAR IN nodeNameList nodeSpecificationList { - Dynamic_Array1 *final = Reachable_Nodes(reachable_info); + DynamicArray1 *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 &arity = reachable_info->node_arity; - Dynamic_Array2 &transitions = reachable_info->transitions; + DynamicArray2 &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 &nodes = reachable_info->start_nodes; + DynamicArray1 &nodes = reachable_info->start_nodes; for(i = 1; i <= n_nodes; i++) if(nodes[i].is_null()) nodes[i] = Relation::False(arity[i]); diff --git a/omegalib/omegacalc/src/parser.yy b/omegalib/omegacalc/src/parser.yy index 896f926..c2821cc 100755 --- a/omegalib/omegacalc/src/parser.yy +++ b/omegalib/omegacalc/src/parser.yy @@ -14,7 +14,7 @@ %{ //#define YYDEBUG 1 -#include +#include #include #include #include @@ -121,7 +121,7 @@ void flushScanBuffer(); omega::Relation *RELATION; tupleDescriptor *TUPLE_DESCRIPTOR; std::pair, std::vector > *REL_TUPLE_PAIR; - omega::Dynamic_Array1 * RELATION_ARRAY_1D; + omega::DynamicArray1 * RELATION_ARRAY_1D; std::string *STRING_VALUE; } @@ -473,7 +473,7 @@ inputItem : ';' /*empty*/ } | reachable ';' { flushScanBuffer(); - Dynamic_Array1 &final = *$1; + DynamicArray1 &final = *$1; bool any_sat = false; int i,n_nodes = reachable_info->node_names.size(); for(i = 1; i <= n_nodes; i++) @@ -1661,13 +1661,13 @@ exp : COEF {$$ = new Exp($1);} reachable : REACHABLE_FROM nodeNameList nodeSpecificationList { - Dynamic_Array1 *final = Reachable_Nodes(reachable_info); + DynamicArray1 *final = Reachable_Nodes(reachable_info); $$ = final; } ; reachable_of : REACHABLE_OF VAR IN nodeNameList nodeSpecificationList { - Dynamic_Array1 *final = Reachable_Nodes(reachable_info); + DynamicArray1 *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)); @@ -1708,7 +1708,7 @@ nodeSpecificationList : OPEN_BRACE realNodeSpecificationList CLOSE_BRACE { int i,j; int n_nodes = reachable_info->node_names.size(); Tuple &arity = reachable_info->node_arity; - Dynamic_Array2 &transitions = reachable_info->transitions; + DynamicArray2 &transitions = reachable_info->transitions; /* fixup unspecified transitions to be false */ /* find arity */ @@ -1735,7 +1735,7 @@ nodeSpecificationList : OPEN_BRACE realNodeSpecificationList CLOSE_BRACE { transitions[i][j] = Relation::False(arity[i],arity[j]); /* fixup unused start node positions */ - Dynamic_Array1 &nodes = reachable_info->start_nodes; + DynamicArray1 &nodes = reachable_info->start_nodes; for(i = 1; i <= n_nodes; i++) if(nodes[i].is_null()) nodes[i] = Relation::False(arity[i]); -- cgit v1.2.3-70-g09d2