bel_parser 1.0.0.alpha.42 → 1.0.0.alpha.43

data/lib/bel_parser/parsers/expression/parameter.rb

@@ -406,12 +406,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -502,12 +509,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -543,12 +557,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -593,12 +614,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -778,12 +806,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -884,12 +919,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -990,12 +1032,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1051,12 +1100,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1112,12 +1168,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1553,12 +1616,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1649,12 +1719,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1690,12 +1767,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1740,12 +1824,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -1925,12 +2016,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2031,12 +2129,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2137,12 +2242,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2198,12 +2310,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2259,12 +2378,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2757,12 +2883,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2853,12 +2986,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2894,12 +3034,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -2944,12 +3091,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -3129,12 +3283,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -3235,12 +3396,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -3341,12 +3509,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -3402,12 +3577,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)
@@ -3463,12 +3645,19 @@ begin
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)

data/lib/bel_parser/parsers/expression/parameter.rl

@@ -26,12 +26,19 @@
     param_node = parameter()
     completed = true
     prefix_node = @buffers.delete(:param_prefix)
-    unless prefix_node.nil?
+    if prefix_node
       param_node <<= prefix_node
       unless prefix_node.complete
         trace('PN incomplete')
         completed = false
       end
+    else
+      prefix_node          = prefix(nil)
+      prefix_node.complete = true
+
+      trace('PN complete (no prefix)')
+      param_node <<= prefix_node
+      completed    = true
     end
 
     value_node = @buffers.delete(:param_value)