activefacts-cql 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd022cd38f05ea499b7713c4d5e01b28e101a445
-  data.tar.gz: 61009d0a5dba377aad97b7f1af587f52b8b85a89
+  metadata.gz: 79eea1540c275b37e1db24f1a39e7715b0af50d1
+  data.tar.gz: cf068ad7b25a9891e64609fdd10a3b2eee26727b
 SHA512:
-  metadata.gz: c602d72038965d2bc49812291bdca817b7eee6d609c61c0cb0db9ae5a4a96eef14f5fb45b2104cb0af4e8fe5bcd44ddef088140279bf9cc5cd8720a199971c46
-  data.tar.gz: 69fb6ce9c7f77a558cf07f6c54fe453d5f27333330d39a889c525eca9bce3604064622073f0564733bd008fa90b366a2af146e1dc8833de6ffbc094a2353c3c9
+  metadata.gz: 287e271910e4c1597c7911168d39b61231e8bed548d096f1c5e133533b1b79e80c3a4f48092d2056726e80ae1c304840bd25c5edea2cd97188e4459319f850b2
+  data.tar.gz: be9d2a0af83823548df7d36b48f5c069f8dee127c55708abeab469580ce15631514c7705241c35774d3f74ee4e0808a72b6d83631ce65ea45e73722be2ed606c

data/Rakefile

@@ -5,6 +5,25 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
+task :build => [:create_treetop_files, :clean_treetop_files]
+task :create_treetop_files do
+  cqlpath = File.expand_path('../lib/activefacts/cql/parser', __FILE__)
+  Dir[cqlpath+"/**/*.treetop"].each do |tt|
+    rb = tt.sub(/treetop\Z/, 'rb')
+    sh(%Q{tt #{tt}})
+  end
+end
+def clean_treetop_files
+  cqlpath = File.expand_path('../lib/activefacts/cql/parser', __FILE__)
+  Dir[cqlpath+"/**/*.treetop"].each do |tt|
+    rb = tt.sub(/treetop\Z/, 'rb')
+    File.unlink(rb) rescue nil
+  end
+end
+task :clean_treetop_files do
+  at_exit { clean_treetop_files }
+end
+
 desc "Bump gem version patch number"
 task :bump do
   path = File.expand_path('../lib/activefacts/cql/version.rb', __FILE__)

data/activefacts-cql.gemspec

@@ -14,14 +14,16 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/cjheath/activefacts-cql"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.
+    split("\x0").
+    reject { |f| f.match(%r{^(test|spec|features)/}) }.
+    map{|file| file.sub(/\.treetop$/,'.rb')}
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.extensions << 'lib/activefacts/cql/Rakefile'
 
   spec.add_development_dependency "bundler", ">= 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "> 10"
   spec.add_development_dependency "rspec", "~> 3.3"
 
   spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.22"

data/lib/activefacts/cql/parser.rb

@@ -261,6 +261,10 @@ module ActiveFacts
             raise failure_reason || "not all input was understood" unless @index == input.size
             return nil  # No input, or no more input
           end
+          unless @vocabulary_seen || !node.ast
+            @vocabulary_seen = Compiler::Vocabulary === node.ast
+            raise "CQL files must begin with a vocabulary, schema or transform definition" unless @vocabulary_seen
+          end
           if @block
             @block.call(node)
           else

data/lib/activefacts/cql/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module CQL
-    VERSION = "1.9.6"
+    VERSION = "1.9.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-cql
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,8 +97,7 @@ description: Compiler for the Constellation Query Language, part of the ActiveFa
 email:
 - clifford.heath@gmail.com
 executables: []
-extensions:
-- lib/activefacts/cql/Rakefile
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -112,7 +111,6 @@ files:
 - bin/setup
 - lib/activefacts/cql.rb
 - lib/activefacts/cql/.gitignore
-- lib/activefacts/cql/Rakefile
 - lib/activefacts/cql/compiler.rb
 - lib/activefacts/cql/compiler/clause.rb
 - lib/activefacts/cql/compiler/constraint.rb
@@ -126,18 +124,18 @@ files:
 - 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
-- lib/activefacts/cql/parser/Context.treetop
-- lib/activefacts/cql/parser/Expressions.treetop
-- lib/activefacts/cql/parser/FactTypes.treetop
-- lib/activefacts/cql/parser/Language/English.treetop
-- lib/activefacts/cql/parser/Language/French.treetop
-- lib/activefacts/cql/parser/Language/Mandarin.treetop
-- 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/CQLParser.rb
+- lib/activefacts/cql/parser/Context.rb
+- lib/activefacts/cql/parser/Expressions.rb
+- lib/activefacts/cql/parser/FactTypes.rb
+- lib/activefacts/cql/parser/Language/English.rb
+- lib/activefacts/cql/parser/Language/French.rb
+- lib/activefacts/cql/parser/Language/Mandarin.rb
+- lib/activefacts/cql/parser/LexicalRules.rb
+- lib/activefacts/cql/parser/ObjectTypes.rb
+- lib/activefacts/cql/parser/Terms.rb
+- lib/activefacts/cql/parser/TransformRules.rb
+- lib/activefacts/cql/parser/ValueTypes.rb
 - lib/activefacts/cql/parser/nodes.rb
 - lib/activefacts/cql/require.rb
 - lib/activefacts/cql/verbaliser.rb

data/lib/activefacts/cql/Rakefile

@@ -1,14 +0,0 @@
-#
-#       ActiveFacts CQL Parser.
-#       A Rakefile to run Treetop when the ActiveFacts gem is installed.
-#       This isn't mandatory but makes it much faster to start the parser.
-#       Delete the generated files during parser development.
-#
-# Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
-#
-task :default do
-  pattern = File.dirname(__FILE__) + '**/*.treetop'
-  files = Dir[pattern]
-  # Hopefully this quoting will work where there are spaces in filenames, and even maybe on Windows?
-  exec "tt '#{files*"' '"}'"
-end

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

@@ -1,258 +0,0 @@
-#
-#       ActiveFacts CQL Parser.
-#       Parse rules relating to high-level CQL definitions and constraints.
-#
-# Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
-#
-require 'activefacts/cql/parser/LexicalRules'
-require 'activefacts/cql/parser/Language/English'
-require 'activefacts/cql/parser/Expressions'
-require 'activefacts/cql/parser/Terms'
-require 'activefacts/cql/parser/ObjectTypes'
-require 'activefacts/cql/parser/ValueTypes'
-require 'activefacts/cql/parser/FactTypes'
-require 'activefacts/cql/parser/TransformRules'
-require 'activefacts/cql/parser/Context'
-
-module ActiveFacts
-  module CQL
-    grammar CQL
-      include LexicalRules
-      include Expressions
-      include Terms
-      include ObjectTypes
-      include ValueTypes
-      include FactTypes
-      include TransformRules
-      include Context
-
-      rule cql_file
-        s seq:definition*
-        {
-          def definitions
-            seq.elements.map{|e|
-                e.value rescue $stderr.puts "Can't call value() on #{e.inspect}"
-              }
-          end
-        }
-      end
-
-      # Each definition has an ast() method that returns an instance of a subclass of Compiler::Definition
-      rule definition
-        definition_body s
-        {
-          def ast
-            definition_body.ast
-          end
-
-          def body
-            definition_body.text_value
-          end
-        }
-      end
-
-      rule definition_body
-        vocabulary_definition
-        / import_definition
-       # Magic here to avoid a Treetop bug with sem-preds, which require a sequence (this doesn't need to make a sequence)
-        / '' &{|s| _nt_prescan; false }           # Always fails, but its side-effects are needed in the following
-        / constraint
-        / unit_definition   # REVISIT: Move this above the prescan?
-        / object_type
-        / informal_description
-        / query
-        / transform_rule
-        / s ';' s { def ast; nil; end }
-      end
-
-      rule vocabulary_definition
-        schema_definition /
-        transform_definition
-      end
-
-      rule schema_definition
-        s ( schema / topic / vocabulary ) S vocabulary_name vn:version_number? s ';'
-        {
-          def ast
-            Compiler::Vocabulary.new(vocabulary_name.value, false, vn.empty? ? nil : vn.value)
-          end
-        }
-      end
-
-      rule transform_definition
-        s transform S vocabulary_name vn:version_number? s ';'
-        {
-          def ast
-            Compiler::Vocabulary.new(vocabulary_name.value, true, vn.empty? ? nil : vn.value)
-          end
-        }
-      end
-
-      rule vocabulary_name
-        id tail:(S !version id)*
-        {
-	  def node_type; :vocabulary; end
-	  def value
-            [id.value, *tail.elements.map{|e| e.id.value }].join(' ')
-	  end
-	}
-      end
-
-      rule import_definition
-        s import i:import_role? S vocabulary_name vp:version_pattern? alias_list ';'
-        {
-          def ast
-            Compiler::Import.new(
-              import.input.parser, vocabulary_name.value, i.empty? ? "topic" : i.value, vp.empty? ? nil : vp.value, alias_list.value
-            )
-          end
-        }
-      end
-
-      rule version_number
-        S version S version_number_string
-        {
-          def value
-            version_number_string.text_value
-          end
-        }
-      end
-
-      rule version_pattern
-        S version S version_pattern_string
-        {
-          def value
-            version_pattern_string.text_value
-          end
-        }
-      end
-
-      rule version_number_string
-        [0-9]+ '.' [0-9]+ '.' [0-9]+ ('-' [0-9A-Za-z-]+ ('.' [0-9A-Za-z-]+ )* )?
-      end
-
-      rule version_pattern_string
-        [0-9]+ ('.' [0-9]+ ('.' [0-9]+ ('-' [0-9A-Za-z-]+ ('.' [0-9A-Za-z-]+ )* )? )? )?
-      end
-
-      rule import_role
-        S id
-        {
-          def value
-            id.text_value
-          end
-        }
-      end
-
-      # REVISIT: Need a way to define equivalent readings for fact types here (and in the metamodel)
-      rule alias_list
-        ( s ',' s alias S aliased_from:alias_term S as S alias_to:alias_term s )*
-        {
-          def value
-            elements.inject({}){|h, e| h[e.aliased_from.value] = e.alias_to; h }
-          end
-        }
-      end
-
-      rule alias_term
-        id
-        { def node_type; :term; end }
-      end
-
-      rule informal_description
-        informally s ',' s
-	  subject:informal_description_subject s
-          informal_description_body
-          informal_description_closer
-        {
-          def ast
-            kind = subject.signifier.text_value.to_sym
-            subject_name = (kind == :each ? subject.term.text_value : subject.reading.text_value)
-            phrases = subject.reading.elements.map(&:ast) if kind == :when
-            Compiler::InformalDefinition.new(kind, subject_name, phrases, informal_description_body.text_value)
-          end
-        }
-      end
-
-      rule informal_description_subject
-	signifier:each S term         # Informal definition of an object type
-	/
-	signifier:when S reading:phrase+ s ','       # or a fact type
-      end
-
-      rule informal_description_body
-	(!informal_description_closer (string / .))*  # Allow . inside a string
-      end
-
-      # The description terminates in a fullstop at the end of a line, or EOF
-      rule informal_description_closer
-	(!. / '.' [ \t\r]* "\n")
-      end
-
-      rule constraint
-        subset_constraint /
-        equality_constraint /
-        set_constraint /
-        presence_constraint
-        # REVISIT: / value_constraint
-      end
-
-      # Adding enforcement to a constraint makes it deontic
-      rule enforcement
-        s '(' s
-          otherwise s
-          action:id s   # An enforcement action, like SMS, email, log, alarm, etc.
-          a:agent? s
-        ')' s
-          {
-            def ast; Compiler::Enforcement.new(action.text_value, a.empty? ? nil : a.text_value); end
-          }
-        /
-        ''
-          {
-            def ast; nil; end
-          }
-      end
-
-      # presence constraint:
-      rule presence_constraint
-        (each_occurs_in_clauses / either_or)
-        {
-          def ast
-            Compiler::PresenceConstraint.new c, enforcement.ast, clauses_ast, role_list_ast, quantifier_ast
-          end
-        }
-      end
-
-      # set (exclusion, mandatory exclusion, complex equality) constraint
-      rule set_constraint
-        (for_each_how_many / either_or_not_both)
-          {
-            def ast
-              Compiler::SetExclusionConstraint.new c, enforcement.ast, clauses_ast, role_list_ast, quantifier_ast
-            end
-          }
-      end
-
-      rule subset_constraint
-        (a_only_if_b / if_b_then_a)
-        {
-          def ast
-            Compiler::SubsetConstraint.new c, enforcement.ast, [clauses.ast, r2.ast]
-          end
-        }
-      end
-
-      rule equality_constraint
-        if_and_only_if
-        {
-          def ast
-            all_clauses = [clauses.ast, *tail.elements.map{|e| e.clauses.ast }]
-            Compiler::SetEqualityConstraint.new c, enforcement.ast, all_clauses
-          end
-        }
-      end
-
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-#
-#       ActiveFacts CQL Parser.
-#       Parse rules relating to definition context.
-#
-# Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
-#
-module ActiveFacts
-  module CQL
-    grammar Context
-      rule context_note
-        '('
-        s w:who_says? s context_type description agreed:(',' a:as_agreed_by)? s
-        ')' s
-        {
-          def value
-            [ w.empty? ? nil : w.value, context_type.value, description.text_value, agreed.empty? ? [] : agreed.a.value]
-          end
-          def ast
-            who = w.empty? ? nil : w.value
-            ag = agreed.empty? ? [] : agreed.a.value
-            Compiler::ContextNote.new context_type.value, description.text_value, who, ag
-          end
-        }
-      end
-
-      rule who_says
-        according_to agents s ','
-        { def value; agents.value; end }
-      end
-
-      rule context_type
-        because s       { def value; 'because'; end } /
-        as_opposed_to   { def value; 'as_opposed_to'; end } /
-        so_that         { def value; 'so_that'; end } /
-        to_avoid        { def value; 'to_avoid'; end }
-      end
-
-      rule description
-        '(' description ')' / (!( [()] / ',' as_agreed_by) .)*
-        {
-          def node_type; :linking; end
-        }
-      end
-    end
-  end
-end