Changeset 2ae16219 for tools/prettyprinter/lex.ll

Timestamp:

Apr 19, 2018, 11:04:47 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

c28bcc7

Parents:

b2da0574 (diff), 61323a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• tools/prettyprinter/lex.ll (modified) (4 diffs)

tools/prettyprinter/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Dec 15 11:45:59 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Aug 29 17:33:36 2017
- * Update Count     : 268
+ * Last Modified On : Sun Apr 15 21:28:33 2018
+ * Update Count     : 271
  */
 
@@ -50 +50 @@
 <INITIAL,C_CODE>"/*" {                                                                  // C style comments */
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
-    cerr << "\"/*\" : " << yytext << endl;
+                cerr << "\"/*\" : " << yytext << endl;
 #endif
-    if ( YYSTATE == C_CODE ) code_str += yytext;
-    else comment_str += yytext;
-    yy_push_state(C_COMMENT);
+                if ( YYSTATE == C_CODE ) code_str += yytext;
+                else comment_str += yytext;
+                yy_push_state(C_COMMENT);
 }
 <C_COMMENT>(.|"\n")     {                                                                       // C style comments
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
-    cerr << "<C_COMMENT>(.|\\n) : " << yytext << endl;
+                cerr << "<C_COMMENT>(.|\\n) : " << yytext << endl;
 #endif
-    if ( yy_top_state() == C_CODE ) code_str += yytext;
-    else comment_str += yytext;
+                if ( yy_top_state() == C_CODE ) code_str += yytext;
+                else comment_str += yytext;
 }
 <C_COMMENT>"*/" {                                                                               // C style comments
@@ -123 +123 @@
 <C_CODE>"%}"    { RETURN_TOKEN( RCURL ) }
 
-^"%union"       { RETURN_TOKEN( UNION ) }
-^"%start"       { RETURN_TOKEN( START ) }
-^"%token"       { RETURN_TOKEN( TOKEN ) }
-^"%type"            { RETURN_TOKEN( TYPE ) }
-^"%left"            { RETURN_TOKEN( LEFT ) }
-^"%right"           { RETURN_TOKEN( RIGHT ) }
-^"%nonassoc"    { RETURN_TOKEN( NONASSOC ) }
-^"%precedence"  { RETURN_TOKEN( PRECEDENCE ) }
+^"%define"[^\n]*"\n" { RETURN_TOKEN( DEFINE ) }
+^"%expect"              { RETURN_TOKEN( EXPECT ) }
+^"%left"                { RETURN_TOKEN( LEFT ) }
+^"%locations"   { RETURN_TOKEN( LOCATIONS ) }
+^"%nonassoc"    { RETURN_TOKEN( NONASSOC ) }
+^"%precedence"  { RETURN_TOKEN( PRECEDENCE ) }
 ^"%pure_parser" { RETURN_TOKEN( PURE_PARSER ) }
+^"%right"               { RETURN_TOKEN( RIGHT ) }
 ^"%semantic_parser"     { RETURN_TOKEN( SEMANTIC_PARSER ) }
-^"%expect"      { RETURN_TOKEN( EXPECT ) }
-^"%thong"               { RETURN_TOKEN( THONG ) }
+^"%start"               { RETURN_TOKEN( START ) }
+^"%thong"               { RETURN_TOKEN( THONG ) }
+^"%token"               { RETURN_TOKEN( TOKEN ) }
+^"%type"                { RETURN_TOKEN( TYPE ) }
+^"%union"               { RETURN_TOKEN( UNION ) }
 
-"%prec"                 { RETURN_TOKEN( PREC ) }
+"%prec"                 { RETURN_TOKEN( PREC ) }
 
-{integer}           { RETURN_TOKEN( INTEGER ); }
-[']{c_char}[']  { RETURN_TOKEN( CHARACTER ); }
-{identifier}    { RETURN_TOKEN( IDENTIFIER ); }
+{integer}               { RETURN_TOKEN( INTEGER ); }
+[']{c_char}[']  { RETURN_TOKEN( CHARACTER ); }
+{identifier}    { RETURN_TOKEN( IDENTIFIER ); }
 
 <C_CODE>["]{s_char}*["] {                                                               // hide braces "{}" in strings
@@ -160 +162 @@
 %%
 void lexC(void) {
-    BEGIN(C_CODE);
+        BEGIN(C_CODE);
 }
 
 string lexYacc(void) {
-    BEGIN(INITIAL);
-    //cerr << "CODE: " << endl << code_str << endl;
-    string temp( code_str );
-    code_str = "";
-    return temp;
+        BEGIN(INITIAL);
+        //cerr << "CODE: " << endl << code_str << endl;
+        string temp( code_str );
+        code_str = "";
+        return temp;
 }