activefacts-cql 1.8.3 → 1.9.1

data/lib/activefacts/cql/parser/Language/French.treetop

@@ -292,7 +292,8 @@ module ActiveFacts
       rule radix_point ',' end
       rule reflexive 'réflexive' !alphanumeric end
       rule returning 'retour' !alphanumeric end
-      rule separate 'distincte' !alphanumeric end 
+      rule separate 'distincte' !alphanumeric end
+      rule schema 'schema' !alphanumeric end
       rule si 'si' !alphanumeric end
       rule so_that 'pour' s 'que' !alphanumeric end
       rule soit 'soit' !alphanumeric end
@@ -302,9 +303,12 @@ module ActiveFacts
       rule then 'puis' !alphanumeric end
       rule to 'à' !alphanumeric end
       rule to_avoid ('pour' s 'empecher' s 'de' / 'pour' s 'ne' s 'pas') !alphanumeric end
+      rule topic 'sujet' !alphanumeric end
+      rule transform 'transform' !alphanumeric end
       rule transient 'transitoires' !alphanumeric end
       rule transitive 'transitif' !alphanumeric end
-      rule true 'vrai' !alphanumeric end 
+      rule true 'vrai' !alphanumeric end
+      rule version 'version' !alphanumeric end 
       rule vocabulary 'vocabulaire' !alphanumeric end 
       rule where 'où' !alphanumeric end 
       rule who 'qui' !alphanumeric end 

data/lib/activefacts/cql/parser/Language/Mandarin.treetop

@@ -294,7 +294,8 @@ module ActiveFacts
       rule to_avoid ('pour' s 'empecher' s 'de' / 'pour' s 'ne' s 'pas') !alphanumeric end
       rule transient 'transitoires' !alphanumeric end
       rule transitive 'transitif' !alphanumeric end
-      rule true 'vrai' !alphanumeric end 
+      rule true 'vrai' !alphanumeric end
+      rule version 'version' !alphanumeric end 
       rule vocabulary 'vocabulaire' !alphanumeric end 
       rule where 'où' !alphanumeric end 
       rule who 'qui' !alphanumeric end 

data/lib/activefacts/cql/parser/Terms.treetop

@@ -155,8 +155,8 @@ module ActiveFacts
 
       rule global_term
         # This rule shouldn't be used outside the prescan, it will memoize the wrong things.
-        head:id x    &{|s| input.context.term_starts?(s[0].text_value, s[1]) }
-        tail:(s w:id &{|s| input.context.term_continues?(s[1].text_value) } )*
+        head:id x    &{|s| input.context.global_term_starts?(s[0].text_value, s[1]) }
+        tail:(s w:id &{|s| input.context.global_term_continues?(s[1].text_value) } )*
         { def value
             tail.elements.inject(head.value) { |t, e| "#{t} #{e.w.value}" }
           end

data/lib/activefacts/cql/parser/TransformRules.treetop

@@ -0,0 +1,226 @@
+#
+#       ActiveFacts CQL Parser.
+#       Parse rules relating to Transformation Rules.
+#
+# Copyright (c) 2017 Factil Pty Ltd. Read the LICENSE file.
+#
+module ActiveFacts
+  module CQL
+    grammar TransformRules
+
+      rule transform_rule
+        ctr:compound_matching s ';'
+        {
+          def ast
+            Compiler::TransformRule.new(ctr.ast)
+          end
+        }
+      end
+
+      rule compound_matching
+        s tl:term_list s '<==' s tq:transform_query? s '{' tr:transform_matchings s '}'
+        {
+          def ast
+            Compiler::CompoundMatching.new(tl.ast, tq.empty? ? nil : tq.ast, tr.ast)
+          end
+        }
+      end
+
+      rule simple_matching
+        s tl:term_list s '<--' s te:transform_expr?
+        {
+          def ast
+            Compiler::SimpleMatching.new(tl.ast, te.empty? ? nil : te.ast)
+          end
+        }
+      end
+
+      rule transform_query
+        cl:clauses_list             { def ast; cl.ast; end; }
+        / t:term                    { def ast; t.ast; end; }
+      end
+
+      rule transform_matchings
+        s r0:transform_matching tail:(s ',' s r1:transform_matching)*
+        {
+          def ast
+            [r0.ast, *tail.elements.map{|e| e.r1.ast }]
+          end
+        }
+      end
+
+      rule transform_matching
+        str:simple_matching            { def ast; str.ast; end; }
+        / ctr:compound_matching        { def ast; ctr.ast; end; }
+      end
+
+      rule term_list
+        s t0:term tail:(s '.' s t1:term_list)*
+        {
+          def ast
+            if tail.elements.empty?
+              [t0.ast]
+            else
+              [t0.ast, *tail.elements.map{|t| t.t1.ast }]
+            end
+          end
+        }
+      end
+
+      rule transform_expr
+        s c:logical_texpr s '?' s t0:logical_texpr s ':' s t1:logical_texpr
+          {
+            def ast
+              Compiler::Ternary.new(c.ast, t0.ast, t1.ast)
+            end
+          }
+        / s o:aggregate_op S agg_of s t:logical_texpr
+          {
+            def ast
+              Compiler::Aggregate.new(o.text_value, t.ast)
+            end
+          }
+        / s t0:logical_texpr    { def ast; t0.ast; end; }
+      end
+
+      rule aggregate_op
+        'sum' / 'average' / 'max' / 'min' / 'count'
+      end
+
+      rule logical_texpr
+        s t0:logical_and_texpr tail:(s op:or s t1:logical_and_texpr)*
+        {
+          def ast
+            if tail.elements.empty?
+              t0.ast
+            else
+              Compiler::LogicalOr.new(t0.ast, *tail.elements.map{|e| e.t1.ast})
+            end
+          end
+        }
+      end
+
+      rule logical_and_texpr
+        s t0:equality_texpr tail:(s op:and s t1:equality_texpr)*
+        {
+          def ast
+            if tail.elements.empty?
+              t0.ast
+            else
+              Compiler::LogicalAnd.new(t0.ast, *tail.elements.map{|e| e.t1.ast})
+            end
+          end
+        }
+      end
+
+      rule equality_texpr
+        s t0:relational_texpr operation:(s op:equality_op s t1:relational_texpr)?
+        {
+          def ast
+            if operation.empty?
+              t0.ast
+            else
+              Compiler::Comparison.new(op.text_value, t0.ast, operation.t1.ast)
+            end
+          end
+        }
+      end
+
+      rule equality_op
+        '=' / '!='
+      end
+
+      rule relational_texpr
+        s t0:additive_texpr operation:(s op:relational_op s t1:additive_texpr)?
+        {
+          def ast
+            if operation.empty?
+              t0.ast
+            else
+              Compiler::Comparison.new(op.text_value, t0.ast, operation.t1.ast)
+            end
+          end
+        }
+      end
+
+      rule relational_op
+        '<' / '>' / '>=' / '<='
+      end
+
+      rule additive_texpr
+        s t0:multiplicative_texpr tail:(s op:additive_op s t1:multiplicative_texpr)*
+        {
+          def ast
+            if tail.elements.empty?
+              t0.ast
+            else
+              Compiler::Sum.new(
+                t0.ast,
+                *tail.elements.map{|e| e.op.text_value == '-' ? Compiler::Negate.new(e.t1.ast) : e.t1.ast}
+              )
+            end
+          end
+        }
+      end
+
+      rule additive_op
+        '+' / '-'
+      end
+
+      rule multiplicative_texpr
+        s t0:unary_texpr tail:(s op:multiplicative_op s t1:unary_texpr)*
+        {
+          def ast
+            if tail.elements.empty?
+              t0.ast
+            else
+              Compiler::Product.new(
+                t0.ast,
+                *tail.elements.map{|e| e.op.text_value == '/' ? Compiler::Reciprocal.new(e.t1.ast) : e.t1.ast}
+              )
+            end
+          end
+        }
+      end
+
+      rule multiplicative_op
+        '*' / '/'
+      end
+
+      rule unary_texpr
+        s u:unary_op? s t:primary_texpr
+        {
+          def ast
+            if u.empty?
+              t.ast
+            else
+              u.text_value == '-' ? Compiler::Negate.new(t.ast) : Compiler::Negation.new(t.ast)
+            end
+          end
+        }
+      end
+
+      rule unary_op
+        '-' / '!'
+      end
+
+      rule primary_texpr
+        tl:term_list
+          {
+            def ast
+              Compiler::ExpressionTermList.new(tl.ast)
+            end
+          }
+        / l:literal
+          {
+            def ast
+              Compiler::Literal.new(l.value, nil)
+            end
+          }
+        # / '(' source_expr ')'
+        # / id '(' source_expr (s ',' s source_expr) * ')'
+      end
+
+    end
+  end
+end

data/lib/activefacts/cql/verbaliser.rb

@@ -472,13 +472,11 @@ module ActiveFacts
         subscript ||= prr.subscript if prr
         trace :subscript, "Need to apply subscript #{subscript} to #{role_ref.role.object_type.name}" if subscript
         object_type = role_ref.role.object_type
-        (play_name ||
-          [
-            role_ref.leading_adjective,
-            object_type.name,
-            role_ref.trailing_adjective
-          ].compact*' '
-        ) +
+        [
+          role_ref.leading_adjective,
+          play_name || object_type.name,
+          role_ref.trailing_adjective
+        ].compact*' ' +
           (value ? ' '+value.inspect : '') +
           (subscript ? "(#{subscript})" : '')
       end

data/lib/activefacts/cql/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module CQL
-    VERSION = "1.8.3"
+    VERSION = "1.9.1"
   end
 end

data/lib/activefacts/input/cql.rb

@@ -12,9 +12,10 @@ module ActiveFacts
     # Invoke as
     #   afgen --<generator> <file>.cql
     class CQL
+      EXTENSIONS = ['fiml', 'fidl', 'fiql', 'cql']
       # Read the specified file
       def self.readfile(filename)
-        if File.basename(filename, '.cql') == "-"
+        if EXTENSIONS.detect { |extension| File.basename(filename, extension) == "-" }
           read(STDIN, "<standard input>")
         else
           File.open(filename) {|file|

data/lib/rubygems_plugin.rb

@@ -1,12 +1,15 @@
-Gem.post_install do |installer|
-  if installer.spec.name == 'activefacts-cql'
-    pattern = installer.dir + '/lib/activefacts/cql/**/*.treetop'
-    files = Dir[pattern]
-    # Hopefully this quoting will work where there are spaces in filenames, and even maybe on Windows?
-    cmd = "tt '#{files*"' '"}'"
-    puts "Compiling Treetop grammars:"
-    puts cmd
-    system cmd
-    puts 'For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts/'
-  end
-end
+#
+# Ruby files are now included in the gem package
+#
+# Gem.post_install do |installer|
+#   if installer.spec.name == 'activefacts-cql'
+#     pattern = installer.dir + '/lib/activefacts/cql/**/*.treetop'
+#     files = Dir[pattern]
+#     # Hopefully this quoting will work where there are spaces in filenames, and even maybe on Windows?
+#     cmd = "tt '#{files*"' '"}'"
+#     puts "Compiling Treetop grammars:"
+#     puts cmd
+#     system cmd
+#     puts 'For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts/'
+#   end
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-cql
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.1
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,7 +61,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.9.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.9.14
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - lib/activefacts/cql/compiler/informal.rb
 - lib/activefacts/cql/compiler/query.rb
 - lib/activefacts/cql/compiler/shared.rb
+- lib/activefacts/cql/compiler/transform_rule.rb
 - lib/activefacts/cql/compiler/value_type.rb
 - lib/activefacts/cql/parser.rb
 - lib/activefacts/cql/parser/CQLParser.treetop
@@ -135,6 +136,7 @@ files:
 - lib/activefacts/cql/parser/LexicalRules.treetop
 - lib/activefacts/cql/parser/ObjectTypes.treetop
 - lib/activefacts/cql/parser/Terms.treetop
+- lib/activefacts/cql/parser/TransformRules.treetop
 - lib/activefacts/cql/parser/ValueTypes.treetop
 - lib/activefacts/cql/parser/nodes.rb
 - lib/activefacts/cql/require.rb