aster 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c85417587339f5f431df3347c2045046b742aae
-  data.tar.gz: 72836e9ed31cd3f4ba159509bebcbbfe28bca42c
+  metadata.gz: 7ae416c0202884d73a16768ac01f7b0e5693e5bb
+  data.tar.gz: fdcb60a7b8bf0b6cdcdbe48bbfb2555f78189cb5
 SHA512:
-  metadata.gz: 54058d24e135d2efee5e8abfc2755b32067f84a4f4210029cdfa688460d478b43ab4ca6f83f2a3904b65a7ea93eb4e84bed1d2e98367e3e0fcac974573122557
-  data.tar.gz: b8d77eb5a75520e918749ebb2e875e3488e25e055c017749a853db83d662caa3da0a975352e36880a45219e18f6b02106786e0aee8d1dbb75ea0ea78181758b5
+  metadata.gz: f18dd67914ad7c8ee11eabb2024be171584dd0bab372f19cca0ecd60061c84b5591ec3dfa66c8dcdc37b3a511181658e617dcf13b242e40ecbc3cc6446ea26f2
+  data.tar.gz: 6e99ec823ba740726b5ec263587e2743257b6f046c034179d574fbbd997b92dd511517f045a2c550c478f4396fd01ced36cef6de72d57174c8950502cd66f9fb

data/TODO

@@ -4,6 +4,8 @@
 
 # Done
 
+* implement set
+* fix if
 * implement sub-language text gathering
 * implement ruby-side macros
 * implement equal

data/lib/aster/environment.rb

@@ -65,10 +65,11 @@ module Aster
             command.sub_commands
           )
         when :if
-          cond_value = eval_command Command.new(command.rest)
-          if is_true?(cond_value)
-            eval_tree command.sub_commands
-          end
+          cond_value = eval_argument command.arguments.first
+          eval_tree command.sub_commands if is_true?(cond_value)
+        when :set
+          var, value, _ = command.arguments
+          self[var] = eval_argument value
         when :not
           cond_value = eval_arguments([command.arguments.first]).first
           is_true?(cond_value) ? "no" : "yes"
@@ -88,18 +89,20 @@ module Aster
         end
       end
 
-      def eval_arguments(arguments)
-        arguments.map do |arg|
-          if arg.is_a?(Command)
-            eval_command(arg)
-          elsif arg.is_a?(Variable)
-            self[arg.name]
-          else
-            arg
-          end
+      def eval_argument(arg)
+        if arg.is_a?(Command)
+          eval_command(arg)
+        elsif arg.is_a?(Variable)
+          self[arg.name]
+        else
+          arg
         end
       end
 
+      def eval_arguments(arguments)
+        arguments.map{|arg| eval_argument arg}
+      end
+
       def is_true?(val)
         val && val.strip == "yes"
       end

data/lib/aster/version.rb

@@ -1,3 +1,3 @@
 module Aster
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_environment.rb

@@ -30,6 +30,12 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal "12", eval("add 1 2 3 {add 3 3}")
   end
 
+  def test_set
+    e = Aster::Environment.new
+    e.eval "set key value"
+    assert_equal "yes", e.eval("equal value $key")
+  end
+
   def test_function
     e = Aster::Environment.new
     e.eval "function test arg1 arg2\n  echo $arg1 and $arg2"
@@ -37,6 +43,12 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal("one and two", e.stdout)
   end
 
+  def test_if
+    e = Aster::Environment.new
+    e.eval "if yes\n  echo test"
+    assert_equal e.stdout, "test"
+  end
+
   def test_macro
     e = Aster::Environment.new
     e.define_macro :double do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aster
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sam Murphy