Changeset 59db689 for src/Parser/lex.ll

Timestamp:

Jun 6, 2015, 11:38:58 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

cd623a4

Parents:

a65d92e

Message:

constant types, first attempt

File:

• src/Parser/lex.ll (modified) (6 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 : Wed Jun  3 22:24:07 2015
- * Update Count     : 336
+ * Last Modified On : Fri Jun  5 17:50:17 2015
+ * Update Count     : 373
  */
 
@@ -27 +27 @@
 #include "lex.h"
 #include "ParseNode.h"
-#include "parser.h"                                                                     // YACC generated definitions based on C++ grammar
+#include "parser.h"                                                                             // YACC generated definitions based on C++ grammar
 
 char *yyfilename;
@@ -34 +34 @@
 #define WHITE_RETURN(x)                                                                 // do nothing
 #define NEWLINE_RETURN()        WHITE_RETURN('\n')
-#define RETURN_VAL(x)           yylval.tok.str = new std::string(yytext); \
+#define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); \
                                         yylval.tok.loc.file = yyfilename; \
                                         yylval.tok.loc.line = yylineno; \
@@ -114 +114 @@
 hex_escape "\\""x""_"?{hex_digits}
 escape_seq {simple_escape}|{octal_escape}|{hex_escape}|{universal_char}
+cwide_prefix "L"|"U"|"u"
+swide_prefix {cwide_prefix}|"u8"
 
                                 // display/white-space characters
@@ -275 +277 @@
 "0"                             { NUMERIC_RETURN(ZERO); }                               // CFA
 "1"                             { NUMERIC_RETURN(ONE); }                                // CFA
-{decimal_constant}      { NUMERIC_RETURN(INTEGERconstant); }
-{octal_constant}        { NUMERIC_RETURN(INTEGERconstant); }
-{hex_constant}          { NUMERIC_RETURN(INTEGERconstant); }
+{decimal_constant} { NUMERIC_RETURN(INTEGERconstant); }
+{octal_constant} { NUMERIC_RETURN(INTEGERconstant); }
+{hex_constant}  { NUMERIC_RETURN(INTEGERconstant); }
 {floating_constant}     { NUMERIC_RETURN(FLOATINGconstant); }
 {hex_floating_constant} { NUMERIC_RETURN(FLOATINGconstant); }
 
                                 /* character constant, allows empty value */
-"L"?"_"?[']             { BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
+({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
 <QUOTE>[^'\\\n]* { *strtext += std::string( yytext ); }
 <QUOTE>['\n]    { BEGIN 0; *strtext += std::string( yytext); RETURN_STR(CHARACTERconstant); }
@@ -288 +290 @@
 
                                 /* string constant */
-"L"?"_"?["]             { BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
+({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
 <STRING>[^"\\\n]* { *strtext += std::string( yytext ); }
-<STRING>["\n]   { BEGIN 0; *strtext += std::string( yytext); RETURN_STR(STRINGliteral); }
+<STRING>["\n]   { BEGIN 0; *strtext += std::string( yytext ); RETURN_STR(STRINGliteral); }
                                 /* " stop highlighting */
 
+                                /* common character/string constant */
 <QUOTE,STRING>{escape_seq} { rm_underscore(); *strtext += std::string( yytext ); }
-<QUOTE,STRING>[\\]      { *strtext += std::string( yytext ); } // unknown escape character
+<QUOTE,STRING>"\\"{h_white}*"\n" {}                                             // continuation
+<QUOTE,STRING>"\\" { *strtext += std::string( yytext ); } // unknown escape character
 
                                 /* punctuation */