Changeset 7bf7fb9 for src/Parser/parser.yy

Timestamp:

Aug 7, 2016, 9:47:37 AM (8 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, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

04273e9, d1625f8

Parents:

35f9114

Message:

more refactoring of parser code

File:

• src/Parser/parser.yy (modified) (4 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  5 15:06:44 2016
-// Update Count     : 1756
+// Last Modified On : Sun Aug  7 09:37:48 2016
+// Update Count     : 1764
 //
 
@@ -60 +60 @@
 std::stack< LinkageSpec::Type > linkageStack;
 TypedefTable typedefTable;
+
+void appendStr( std::string &to, std::string *from ) {
+        // "abc" "def" "ghi" => "abcdefghi", remove new text from quotes and insert before last quote in old string.
+        to.insert( to.length() - 1, from->substr( 1, from->length() - 2 ) );
+} // appendStr
 %}
 
@@ -304 +309 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-INTEGERconstant                                                                 { $$ = makeConstantInteger( *$1 ); }
-        | FLOATINGconstant                                                      { $$ = makeConstantFloat( *$1 ); }
-        | CHARACTERconstant                                                     { $$ = makeConstantChar( *$1 ); }
+INTEGERconstant                                                                 { $$ = build_constantInteger( *$1 ); }
+        | FLOATINGconstant                                                      { $$ = build_constantFloat( *$1 ); }
+        | CHARACTERconstant                                                     { $$ = build_constantChar( *$1 ); }
         ;
 
@@ -331 +336 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = makeConstantStr( *$1 ); }
-        | string_literal_list STRINGliteral                     { $$ = $1->appendstr( $2 ); }
+        STRINGliteral                                                           { $$ = build_constantStr( *$1 ); }
+        | string_literal_list STRINGliteral
+                {
+                        appendStr( $1->get_expr()->get_constant()->get_value(), $2 );
+                        delete $2;                                                                      // allocated by lexer
+                        $$ = $1;
+                }
         ;