re_duxml 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 785d74d157df234ce45edc8a0e7e87d95ced0d5d
-  data.tar.gz: 39b1ab5dd640ca985b3f5d6a164cd5a6452014f1
+  metadata.gz: 137900a8cff029f268daeb5a3e7423dd2cc7976f
+  data.tar.gz: 1446449984ed19d2545ccf2ee42a1f64bb0fb922
 SHA512:
-  metadata.gz: 04a3a233407aacffdfd04dd02b23655a5d7e316c5d265f30b916e64e997c6de77f9c3a8e1f69d50de708e446f936d7895388ca203dea8db88d4a329ef53f2956
-  data.tar.gz: 7f47642f7815b3962a18e3bb6dfa12b56f1b6d5b0f909ce58170d7577750c31857816a617cc83ffe8f152000bd8a4734347152f7618e7f055549aefcf3496013
+  metadata.gz: 7d89f27bbf73a6311ffc0b7c38458e7b6959f07aea9dbffa2af3d1b7cbff0b0e2dba4a4b3034a7a5c7e5ba55fbe9dc15377f4f5d46fb02d5955b0c4bd9ac1ce1
+  data.tar.gz: 8035361a455de992579d58bab2e563172dbf39cfcf85399c61589cb6b10ee15db0fac7340e57c94bea58a55cbc9ff48c35f44bfce7bd25093675c33ce7991293

data/lib/re_duxml.rb

@@ -90,7 +90,12 @@ module ReDuxml
     return output_str if questions.empty?
     questions.each do |question|
       reply = Macro.new e.evaluate(question, param_hash).to_s
-      replacement_str = reply.parameterized? ? reply.macro_string : reply.demacro
+      replacement_str = if reply.parameterized?
+          reply.to_s
+        else
+          macro_value = reply.demacro
+          Regexp.string.match(macro_value) ? macro_value[1..-2] : macro_value
+        end
       macro_string = Macro.new(question).macro_string
       output_str.gsub!(macro_string, replacement_str)
     end

data/lib/re_duxml/evaluate.rb

@@ -56,7 +56,9 @@ module ReDuxml
     include Symbolic
 
     def reduce(_ast)
-      ast = _ast.type.respond_to?(:symbol) ? _ast : new_ast(parser.logic[_ast.type.to_s], _ast.children.dup)
+      return _ast if _ast.children.empty?
+      ast = _ast.type.respond_to?(:symbol) ? _ast
+        : new_ast(parser.logic[_ast.type.to_s], _ast.children.dup)
       if ast.children.any?
         operator = ast.type
         args = ast.children.collect do |c|

data/lib/re_duxml/evaluate/parser.rb

@@ -126,7 +126,7 @@ module ReDuxml
       unless output.count == 1
         fail ParseError, "Invalid statement"
       end
-
+      
       output.first
     end # def parse(expr)
 
@@ -142,4 +142,4 @@ module ReDuxml
       Array.new(count) { output.pop }.reverse.compact
     end
   end # class Parser
-end # module ReDuxml
+end # module ReDuxml

data/lib/ruby_ext/macro.rb

@@ -44,8 +44,13 @@ class Macro
     macro_string[2..-2]
   end
 
+  def to_s
+    macro_string
+  end
+
   # returns nil if not, and match data for any parameter names found
   def parameterized?
+    return false if macro_string[2] == '"' && macro_string[-2] == '"'
     macro_string.match Regexp.identifier
   end
-end # class Macro
+end # class Macro

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re_duxml
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Peter Kong