lib/fig/grammar.treetop in fig-0.1.51-java vs lib/fig/grammar.treetop in fig-0.1.52

@@ -1,17 +1,17 @@
 require 'fig/package'
-require 'fig/package/archive'
-require 'fig/package/command'
-require 'fig/package/configuration'
-require 'fig/package/include'
-require 'fig/package/install'
-require 'fig/package/override'
-require 'fig/package/path'
-require 'fig/package/publish'
-require 'fig/package/resource'
-require 'fig/package/retrieve'
-require 'fig/package/set'
+require 'fig/packagedescriptor'
+require 'fig/statement/archive'
+require 'fig/statement/command'
+require 'fig/statement/configuration'
+require 'fig/statement/include'
+require 'fig/statement/override'
+require 'fig/statement/path'
+require 'fig/statement/publish'
+require 'fig/statement/resource'
+require 'fig/statement/retrieve'
+require 'fig/statement/set'
 
 module Fig
 
 grammar Fig
   rule package
@@ -32,27 +32,27 @@
   end
 
   rule archive
     "archive" ws url {
       def to_package_statement
-        Package::Archive.new(url.value.text_value)
+        Statement::Archive.new(url.value.text_value)
       end
     }
   end
 
   rule resource
     "resource" ws url {
       def to_package_statement
-        Package::Resource.new(url.value.text_value)
+        Statement::Resource.new(url.value.text_value)
       end
     }
   end
 
   rule retrieve
     "retrieve" ws var:retrieve_variable "->" path:retrieve_path ws {
       def to_package_statement
-        Package::Retrieve.new(var.text_value, path.text_value)
+        Statement::Retrieve.new(var.text_value, path.text_value)
       end
     }
   end
 
   rule retrieve_variable
@@ -61,22 +61,14 @@
 
   rule retrieve_path
     [a-zA-Z0-9_/.\[\]-]+
   end
 
-  rule install
-    "install" ws statements:config_statement* "end" ws {
-      def to_package_statement
-        Package::Install.new(statements.elements.map { |statement| statement.to_config_statement })
-      end
-    }
-  end
-
   rule config
     "config" ws config_name ws statements:config_statement* "end" ws {
       def to_package_statement
-        Package::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
+        Statement::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
       end
     }
   end
 
   rule config_statement
@@ -84,30 +76,30 @@
   end
 
   rule include
     "include" ws descriptor overrides:(override*) {
       def to_config_statement
-        package = descriptor.respond_to?(:package) ? descriptor.package.text_value : nil
-        config = descriptor.get_config
-        version = descriptor.get_version
-        Package::Include.new(package, config, version, overrides.elements.map{ |e| e.to_override })
+        Statement::Include.new(
+          PackageDescriptor.parse(descriptor.text_value.strip),
+          overrides.elements.map{ |e| e.to_override }
+        )
       end
     }
   end
 
   rule override
     "override" ws package_name "/" version_name ws {
       def to_override
-        return Package::Override.new(package_name.text_value, version_name.text_value)
+        return Statement::Override.new(package_name.text_value, version_name.text_value)
       end
     }
   end
 
   rule path
     ("append" / "path" / "add") ws name:path_name "=" value:path_value ws {
       def to_config_statement
-        Package::Path.new(name.text_value, value.text_value)
+        Statement::Path.new(name.text_value, value.text_value)
       end
     }
   end
 
   rule path_name
@@ -119,11 +111,11 @@
   end
 
   rule set
     "set" ws name:set_name "=" value:set_value ws {
       def to_config_statement
-        Package::Set.new(name.text_value, value.text_value)
+        Statement::Set.new(name.text_value, value.text_value)
       end
     }
   end
 
   rule set_name
@@ -135,10 +127,10 @@
   end
 
   rule command
     "command" ws string {
       def to_config_statement
-        Package::Command.new(string.value.text_value)
+        Statement::Command.new(string.value.text_value)
       end
     }
   end
 
   rule string