lib/fig/grammar.treetop in fig-0.1.53 vs lib/fig/grammar.treetop in fig-0.1.54

@@ -19,11 +19,14 @@
       def to_package(package_name, version_name, directory)
         Package.new(
           package_name,
           version_name,
           directory,
-          statements.elements.map { |statement| statement.to_package_statement }
+          statements.elements.map do
+            |statement|
+            statement.to_package_statement(package_name)
+          end
         )
       end
     }
   end
 
@@ -31,27 +34,27 @@
     archive / resource / retrieve / config
   end
 
   rule archive
     "archive" ws url {
-      def to_package_statement
+      def to_package_statement(package_name)
         Statement::Archive.new(url.value.text_value)
       end
     }
   end
 
   rule resource
     "resource" ws url {
-      def to_package_statement
+      def to_package_statement(package_name)
         Statement::Resource.new(url.value.text_value)
       end
     }
   end
 
   rule retrieve
     "retrieve" ws var:retrieve_variable "->" path:retrieve_path ws {
-      def to_package_statement
+      def to_package_statement(package_name)
         Statement::Retrieve.new(var.text_value, path.text_value)
       end
     }
   end
 
@@ -63,26 +66,33 @@
     [a-zA-Z0-9_/.\[\]-]+
   end
 
   rule config
     "config" ws config_name ws statements:config_statement* "end" ws {
-      def to_package_statement
-        Statement::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
+      def to_package_statement(package_name)
+        Statement::Configuration.new(
+          config_name.text_value,
+          statements.elements.map do
+            |statement|
+            statement.to_config_statement(package_name)
+          end
+        )
       end
     }
   end
 
   rule config_statement
     include / command / path / set
   end
 
   rule include
     "include" ws descriptor overrides:(override*) {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Include.new(
           PackageDescriptor.parse(descriptor.text_value.strip),
-          overrides.elements.map{ |e| e.to_override }
+          overrides.elements.map{ |e| e.to_override },
+          package_name
         )
       end
     }
   end
 
@@ -94,11 +104,11 @@
     }
   end
 
   rule path
     ("append" / "path" / "add") ws name:path_name "=" value:path_value ws {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Path.new(name.text_value, value.text_value)
       end
     }
   end
 
@@ -110,11 +120,11 @@
     [@a-zA-Z0-9/\\._-]+
   end
 
   rule set
     "set" ws name:set_name "=" value:set_value ws {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Set.new(name.text_value, value.text_value)
       end
     }
   end
 
@@ -126,10 +136,10 @@
     [@a-zA-Z0-9/\\._-]*
   end
 
   rule command
     "command" ws string {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Command.new(string.value.text_value)
       end
     }
   end