activefacts-cql 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4fec528ea30db43664caba24b4eae5b394d59b
-  data.tar.gz: 670db8c27a33bf2a3777127fd3d41babd0641718
+  metadata.gz: 17b326a796d8f23d4b73ca8af114df35ae8d1cb0
+  data.tar.gz: 9b99bebe1d49eb09878bb3df01302f7649e58fea
 SHA512:
-  metadata.gz: d57cf6ed6d728b03c4f4b644e4a1866e313d53fef2315674be23f1f0695b7294b3ef388196c7bf95aca581a54b4da29b0ce65a79fe9944b17d128c0441e092d6
-  data.tar.gz: 46e7553490bd3bcaf73c65b5006d7c1f13e38fbaf46e41f4d1a32ce6afaa0066c9e15e723ea2a48f22af887fb562c4fb6e26a8a954c66f57e6d67a9669a3ced1
+  metadata.gz: 15e06b8dea51d28928b9618f0b3903c6db8721a4695f5682a8d0391f5d48a88851d04e6aa7db215f97b64296e97f0a4a4ab660a549634d5632efbbb96101badf
+  data.tar.gz: bff64b710592ac5bf3ff9da9b1a99243da09a6dd8c613af478da0b15e363c5bfb7ef08826e4fa16573d0f23f8b63062fe2ea60287f899c9edf93da465c98add0

data/lib/activefacts/cql/compiler/clause.rb

@@ -860,8 +860,8 @@ module ActiveFacts
       end
 
       class Reference
-        attr_reader :term, :quantifier, :function_call, :value_constraint, :literal, :nested_clauses
-        attr_accessor :leading_adjective, :trailing_adjective, :role_name
+        attr_reader :term, :function_call, :value_constraint, :literal, :nested_clauses
+        attr_accessor :quantifier, :leading_adjective, :trailing_adjective, :role_name
         attr_accessor :player     # What ObjectType does the Binding denote
         attr_accessor :binding    # What Binding for that ObjectType
         attr_accessor :role       # Which Role of this ObjectType
@@ -1105,7 +1105,7 @@ module ActiveFacts
         attr_accessor :enforcement
         attr_accessor :context_note
         attr_accessor :pragmas
-        attr_reader :min, :max
+        attr_accessor :min, :max
 
         def initialize min, max, enforcement = nil, context_note = nil, pragmas = nil
           @min = min

data/lib/activefacts/cql/compiler/entity_type.rb

@@ -54,7 +54,7 @@ module ActiveFacts
 
           # At this point, @identification is an array of References and/or Clauses (for unary fact types)
           # Have to do this after creating the necessary fact types
-          complete_reference_mode_fact_type fact_types
+          complete_reference_mode_fact_type context, fact_types
 
           # Find the roles to use if we have to create an identifying uniqueness constraint:
           identifying_roles = bind_identifying_roles context
@@ -276,8 +276,17 @@ module ActiveFacts
           @reference_mode_value_type = vt
         end
 
-        def complete_reference_mode_fact_type(fact_types)
-          return unless identifying_type = @reference_mode_value_type
+        def complete_reference_mode_fact_type context, fact_types
+          identifying_type =
+            @reference_mode_value_type ||
+            begin
+              @identification &&                              # There's an "identified by" clause
+              @identification.size == 1 &&                    # With just one identifying role
+              (id = @identification[0]).is_a?(Reference) &&   # Which is a simple reference
+              @clauses.size == 0 &&                           # No readings for this role
+              id.binding.player                               # And the player is bound already
+            end
+          return unless identifying_type
 
           # Find an existing fact type, if any:
           entity_role = identifying_role = nil

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

@@ -71,8 +71,13 @@ module ActiveFacts
       end
 
       rule vocabulary_name
-        id
-        { def node_type; :vocabulary; end }
+        id tail:(S id)*
+        {
+	  def node_type; :vocabulary; end
+	  def value
+            [id.value, *tail.elements.map{|e| e.id.value }].join(' ')
+	  end
+	}
       end
 
       rule import_definition

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

@@ -16,18 +16,31 @@ module ActiveFacts
         }
       end
 
-      rule named_fact_type
-        s each?
-        s term_definition_name
-        mapping_pragmas is_where
+      rule fact_type
+        s each:(each)?	    # Chew the "each" or it will get accepted as a quantifier
+	name:(s term_definition_name mapping_pragmas is_where)?	  # Name of objectifying entity type
         anonymous_fact_type
         {
           def ast
             ft = anonymous_fact_type.ast
-            ft.name = term_definition_name.value
-            pragmas = mapping_pragmas.value
-            pragmas << 'independent' if is_where.independent
-            ft.pragmas = pragmas
+	    if !name.empty?
+	      # "each" is often used, and doesn't imply uniqueness
+	      ft.name = name.term_definition_name.value
+	      pragmas = name.mapping_pragmas.value
+	      pragmas << 'independent' if name.is_where.independent
+	      ft.pragmas = pragmas
+	    elsif !each.empty?
+	      # Handle the implied mandatory constraint on the appropriate role
+	      first_reading = ft.clauses[0]
+	      refs = first_reading.refs
+	      raise "Ambiguous 'each' implies mandatory on fact type of arity #{refs.size}" unless refs.size == 2
+	      q = refs[-1].quantifier
+	      if q
+		q.min = 1  # Make the existing quantifier mandatory
+	      else
+		refs[-1].quantifier = q = Compiler::Quantifier.new(1, nil)
+	      end
+	    end
             ft
           end
         }
@@ -66,7 +79,7 @@ module ActiveFacts
       rule query_clauses
         qualified_clauses
           # REVISIT: This creates no precedence between and/or, which could cause confusion.
-          # Should disallow mixed conjuntions - using a sempred?
+          # Should disallow mixed conjunctions - using a sempred?
           ftail:( conjunction:(',' / and / or ) s qualified_clauses s )*
         {
           def ast

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

@@ -167,8 +167,7 @@ module ActiveFacts
       end
 
       rule quantifier1
-        (each s                   { def value; [1, nil]; end })
-        / (some s                 { def value; nil; end })
+          (some s                 { def value; nil; end })
           # REVISIT: "Some" means that any prior occurrence of this role player is to be ignored; this is a new occurrence
           # "that" on the other hand means that this role player was *previously* designated using "some".
           # These distinctions are lost here
@@ -308,7 +307,7 @@ module ActiveFacts
       rule transient 'transient' !alphanumeric end
       rule transitive 'transitive' !alphanumeric end
       rule true 'true' !alphanumeric end
-      rule vocabulary 'vocabulary' !alphanumeric end
+      rule vocabulary ('vocabulary' / 'schema') !alphanumeric end
       rule when 'when' !alphanumeric end
       rule where 'where' !alphanumeric end
       rule which 'which' !alphanumeric end

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

@@ -10,8 +10,7 @@ module ActiveFacts
       rule object_type
         value_type
         / entity_type
-        / named_fact_type
-        / anonymous_fact_type
+        / fact_type
       end
 
       rule entity_type
@@ -93,7 +92,7 @@ module ActiveFacts
             end
           }
         /
-        identified_by role_list
+        identified_by role_list	  # REVISIT: We'd like to be able to use implicit_value_type_names here too.
           &{|s|
             role_list = s[-1]
             forwards = role_list.ast.

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

@@ -44,6 +44,9 @@ module ActiveFacts
         in S units
       end
 
+      # A ValueType name that might not yet have been identified or registered as a Term
+      # REVISIT: We'd like to support multi-word terms here (cannot include "where", "and", or anything that could follow in the value_type definition)
+      # REVISIT: We'd like these to be forward-referenced ObjectTypes too, not immediately created as ValueTypes
       rule implicit_value_type_name
         id
         {

data/lib/activefacts/cql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-cql
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler