Changeset a073d46 for src/Parser/parser.yy

Timestamp:

Feb 9, 2017, 5:31:49 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

132fad4

Parents:

9e45e46 (diff), e994912 (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:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (2 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 Feb  6 16:00:29 2017
-// Update Count     : 2181
+// Last Modified On : Thu Feb  9 15:00:03 2017
+// Update Count     : 2184
 //
 
@@ -2088 +2088 @@
         declaration
         | external_function_definition
-        | asm_statement                                                                         // GCC, global assembler statement
-                {}
+        | ASM '(' string_literal ')' ';'                                        // GCC, global assembler statement
+                {
+                        $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asmstmt( false, $3, 0 ) ) );
+                }
         | EXTERN STRINGliteral                                                          // C++-style linkage specifier
                 {