BRL-CAD/stepcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused tokens in expparse.y, add comments, clean up

Browse Source 
remove four unused terminals - TOK_CONTEXT TOK_END_CONTEXT TOK_END_MODEL TOK_MODEL

clean up formatting (tabs -> spaces, etc)

add comments referring to part 11 ed1/2 BNF rules

remove some code that's commented out

Conflicts:

	src/express/expparse.y
This commit is contained in:
Mark Pictor
2011-09-01 20:23:55 -04:00
parent 4e941d968c
commit d6da40c347
4 changed files with 3650 additions and 1610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/express/expparse.y
+1600 -1602
View File
File diff suppressed because it is too large Load Diff
src/express/expparse.y~
+2042
View File
File diff suppressed because it is too large Load Diff
src/express/exptoks.h
+4 -4
View File
@@ -40,7 +40,7 @@
#define TOK_COLON 297
#define TOK_COMMA 298
#define TOK_CONSTANT 299
#define TOK_CONTEXT 300
// #define TOK_CONTEXT 300
#define TOK_E 301
#define TOK_DERIVE 302
#define TOK_ELSE 303
@@ -48,12 +48,12 @@
#define TOK_END_ALIAS 305
#define TOK_END_CASE 306
#define TOK_END_CONSTANT 307
#define TOK_END_CONTEXT 308
// #define TOK_END_CONTEXT 308
#define TOK_END_ENTITY 309
#define TOK_END_FUNCTION 310
#define TOK_END_IF 311
#define TOK_END_LOCAL 312
#define TOK_END_MODEL 313
// #define TOK_END_MODEL 313
#define TOK_END_PROCEDURE 314
#define TOK_END_REPEAT 315
#define TOK_END_RULE 316
@@ -76,7 +76,7 @@
#define TOK_LIST 333
#define TOK_LOCAL 334
#define TOK_LOGICAL 335
#define TOK_MODEL 336
// #define TOK_MODEL 336
#define TOK_NUMBER 337
#define TOK_OF 338
#define TOK_ONEOF 339
src/express/lexact.c
+4 -4
View File
@@ -111,7 +111,7 @@ static struct keyword_entry {
{ "CASE", TOK_CASE },
{ "CONST_E", TOK_E },
{ "CONSTANT", TOK_CONSTANT },
{ "CONTEXT", TOK_CONTEXT },
/* { "CONTEXT", TOK_CONTEXT },*/
{ "COS", TOK_BUILTIN_FUNCTION },
{ "DERIVE", TOK_DERIVE },
{ "DIV", TOK_DIV },
@@ -120,12 +120,12 @@ static struct keyword_entry {
{ "END_ALIAS", TOK_END_ALIAS },
{ "END_CASE", TOK_END_CASE },
{ "END_CONSTANT", TOK_END_CONSTANT },
{ "END_CONTEXT", TOK_END_CONTEXT },
/* { "END_CONTEXT", TOK_END_CONTEXT },*/
{ "END_ENTITY", TOK_END_ENTITY },
{ "END_FUNCTION", TOK_END_FUNCTION },
{ "END_IF", TOK_END_IF },
{ "END_LOCAL", TOK_END_LOCAL },
{ "END_MODEL", TOK_END_MODEL },
/* { "END_MODEL", TOK_END_MODEL },*/
{ "END_PROCEDURE", TOK_END_PROCEDURE },
{ "END_REPEAT", TOK_END_REPEAT },
{ "END_RULE", TOK_END_RULE },
@@ -162,7 +162,7 @@ static struct keyword_entry {
{ "LOGICAL", TOK_LOGICAL },
{ "LOINDEX", TOK_BUILTIN_FUNCTION },
{ "MOD", TOK_MOD },
{ "MODEL", TOK_MODEL },
/* { "MODEL", TOK_MODEL },*/
{ "NOT", TOK_NOT },
{ "NUMBER", TOK_NUMBER },
{ "NVL", TOK_BUILTIN_FUNCTION },