Changeset 2acf5fc for src/Parser/parser.yy

Timestamp:

Aug 22, 2016, 3:11:00 PM (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:

837a17c, bd9f8be, c1c1112

Parents:

ab57786 (diff), 8d2844a (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

• src/Parser/parser.yy (modified) (3 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 : Mon Aug 22 14:15:15 2016
-// Update Count     : 1943
+// Last Modified On : Mon Aug 22 14:30:56 2016
+// Update Count     : 1944
 //
 
@@ -2153 +2153 @@
 asm_name_opt:                                                                                   // GCC
         // empty
-        | ASM '(' string_literal ')' attribute_list_opt
+        | ASM '(' string_literal_list ')' attribute_list_opt
+                { delete $3; }
         ;
 
@@ -2183 +2184 @@
         | any_word
         | any_word '(' comma_expression_opt ')'
+                { delete $3; }
         ;