story-gen 0.1.1 → 0.1.2

data/NEWS

@@ -1,3 +1,7 @@
+0.1.2:
+  Bug fixes
+  Comparison expression may now be the top expression (e. g., ^X = ^Y)
+
 0.1.1:
   "-m" or "--allow-comma-in-facts" is removed
   Comma (",") in Facts is always allowed

data/lib/story/compile.rb

@@ -498,22 +498,16 @@ class Story
           end
         to_code = lambda do |operand|
           case operand
-          when Var then "#{var_arg_valuess}[#{e1.var_args_indexes[operand]}]"
+          when Var then code << "#{var_arg_valuess}[#{e1.var_args_indexes[operand]}]"
           when Above[Var] then at(operand.pos) { operand.var.name }
-          else operand.to_rb
+          else code << operand.to_rb
           end
         end
-        rb_op =
-          case e2.op
-          when "==", "!=", "<=", ">=", "<", ">" then e2.op
-          when "<>", "=/=" then "!="
-          when "=" then "=="
-          end
         with_var_args(
           e1.var_args,
           code << "(" <<
             e1.to_code << ".select do |#{var_arg_valuess}| "<<
-              at(e2.pos) { to_code.(e2.e1) << rb_op << to_code.(e2.e2) } << " "<<
+              at(e2.pos) { to_code.(e2.e1) << e2.rb_op << to_code.(e2.e2) } << " "<<
             "end " <<
           ")"
         )
@@ -557,7 +551,35 @@ class Story
     
   end
   
-  FactExpr::Select = ASTNode.new :e1, :op, :e2
+  FactExpr::Select = ASTNode.new :e1, :op, :e2 do
+    
+    include FactExpr
+    
+    def to_code
+      to_code = lambda do |operand|
+        case operand
+        when Var then raise Parse::Error.new(operand.pos, "not supported")
+        when Above[Var] then at(operand.pos) { operand.var.name }
+        else code << operand.to_rb
+        end
+      end
+      # 
+      with_var_args(
+        [],
+        code << "(if " << to_code.(e1) << rb_op << to_code.(e2) << " then [[]] else [] end)"
+      )
+    end
+    
+    # @return [String] Ruby analogue of {#op}.
+    def rb_op
+      case op
+      when "==", "!=", "<=", ">=", "<", ">" then op
+      when "<>", "=/=" then "!="
+      when "=" then "=="
+      end
+    end
+    
+  end
   
   FactExpr::Or = ASTNode.new :e1, :e2 do
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story-gen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Generate stories from descriptions based on Facts!
 email: various.furriness@gmail.com