activefacts 0.8.12 → 0.8.13

data/Manifest.txt

@@ -70,6 +70,7 @@ lib/activefacts/cql/compiler/fact_type.rb
 lib/activefacts/cql/compiler/join.rb
 lib/activefacts/cql/compiler/shared.rb
 lib/activefacts/cql/compiler/value_type.rb
+lib/activefacts/cql/nodes.rb
 lib/activefacts/cql/parser.rb
 lib/activefacts/generate/absorption.rb
 lib/activefacts/generate/cql.rb

data/lib/activefacts/cql/nodes.rb

@@ -0,0 +1,49 @@
+module ActiveFacts
+  module CQL
+    class Parser
+      class TermNode < Treetop::Runtime::SyntaxNode
+        def ast quantifier = nil, function_call = nil, role_name = nil, value_constraint = nil, literal = nil, nested_clauses = nil
+          t = x.context[:term]
+          gt = x.context[:global_term]
+          if t.size > gt.size and t[-gt.size..-1] == gt
+            leading_adjective = t[0...-gt.size-1]
+            leading_adjective.sub!(/ /, '-') if !tail.elements[0].dbl.empty?
+          end
+          if t.size > gt.size and t[0...gt.size] == gt
+            trailing_adjective = t[gt.size+1..-1]
+            trailing_adjective.sub!(/ (\S*)\Z/, '-\1') if !tail.elements[-1].dbl.empty?
+          end
+          Compiler::VarRef.new(gt, leading_adjective, trailing_adjective, quantifier, function_call, role_name, value_constraint, literal, nested_clauses)
+        end
+
+        def value             # Sometimes we just want the full term name
+          x.context[:term]
+        end
+
+        def node_type
+          :term
+        end
+      end
+
+      class TermLANode < TermNode
+        def ast quantifier = nil, function_call = nil, role_name = nil, value_constraint = nil, literal = nil, nested_clauses = nil
+          ast = term.ast(quantifier, function_call, role_name, value_constraint, literal, nested_clauses)
+          ast.leading_adjective = head.text_value
+          ast
+        end
+      end
+
+      class TermDefinitionNameNode < TermNode
+        def value
+          t.elements.inject([
+            id.value
+          ]){|a, e| a << e.id.value}*' '
+        end
+
+        def node_type
+          :term
+        end
+      end
+    end
+  end
+end

data/lib/activefacts/version.rb

@@ -5,5 +5,5 @@
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
 module ActiveFacts
-  VERSION = '0.8.12'
+  VERSION = '0.8.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
   prerelease: 
 platform: ruby
 authors:
@@ -188,6 +188,7 @@ files:
 - lib/activefacts/cql/compiler/join.rb
 - lib/activefacts/cql/compiler/shared.rb
 - lib/activefacts/cql/compiler/value_type.rb
+- lib/activefacts/cql/nodes.rb
 - lib/activefacts/cql/parser.rb
 - lib/activefacts/generate/absorption.rb
 - lib/activefacts/generate/cql.rb