Changeset 3d5701e for src/Parser/lex.ll

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• src/Parser/lex.ll (modified) (4 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sun Aug  4 20:53:47 2019
- * Update Count     : 719
+ * Last Modified On : Sat Feb 15 11:05:50 2020
+ * Update Count     : 737
  */
 
@@ -42 +42 @@
 #include "ParseNode.h"
 #include "TypedefTable.h"
+
+string * build_postfix_name( string * name );
 
 char *yyfilename;
@@ -330 +332 @@
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
-"`"{identifier}"`" {                                                                    // CFA
-        yytext[yyleng - 1] = '\0'; yytext += 1;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
+"``"{identifier} {                                                                              // CFA
+        yytext[yyleng] = '\0'; yytext += 2;                                     // SKULLDUGGERY: remove backquotes (ok to shorten?)
         IDENTIFIER_RETURN();
 }
@@ -432 +434 @@
 "?"({op_unary_pre_post}|"()"|"[?]"|"{}") { IDENTIFIER_RETURN(); }
 "^?{}"                  { IDENTIFIER_RETURN(); }
-"?`"{identifier} { IDENTIFIER_RETURN(); }                               // postfix operator
+"?`"{identifier} {                                                                              // postfix operator
+        yylval.tok.str = new string( &yytext[2] );                      // remove ?`
+        yylval.tok.str = build_postfix_name( yylval.tok.str ); // add prefix
+        RETURN_LOCN( typedefTable.isKind( *yylval.tok.str ) );
+}
 "?"{op_binary_over}"?"  { IDENTIFIER_RETURN(); }                // binary
         /*