Update

wichtounet · Apr 16, 2014 · ab0a2b7 · ab0a2b7
1 parent b2087e0
commit ab0a2b7
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/src/parser_x3/SpiritParser.cpp b/src/parser_x3/SpiritParser.cpp
@@ -26,20 +26,8 @@ using namespace eddic;
 
 namespace x3_ast {
 
-struct function_declaration;
-struct import;
-
 struct nil {};
 
-typedef x3::variant<
-        x3::forward_ast<import>,
-        x3::forward_ast<function_declaration>
-    > block;
-
-struct source_file {
-    std::vector<block> blocks;
-};
-
 struct function_declaration {
     std::string type;
     std::string name;
@@ -49,6 +37,15 @@ struct import {
     std::string file;
 };
 
+typedef x3::variant<
+        function_declaration,
+        import
+    > block;
+
+struct source_file {
+    std::vector<block> blocks;
+};
+
 } //end of x3_ast namespace
 
 BOOST_FUSION_ADAPT_STRUCT(
@@ -80,17 +77,19 @@ namespace x3_grammar {
     x3::rule<import_id, x3_ast::import> const import("import");
 
     auto const import_def = 
-            x3::lit("import") 
+            x3::eps 
+        >>  x3::lit("import") 
         >>  '"' 
         >>  *x3::alpha
-        >>  '"';
+        >>  '"' ;
 
     auto const function_declaration_def = *x3::alpha >> *x3::alpha >> '(' >> ')';
 
     auto const source_file_def = 
-        *(
-                import
-            |   function_declaration
+        x3::eps >>
+         *(
+                function_declaration
+            |   import
          );
 
     auto const parser = x3::grammar(