activefacts-cql 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf73dfa6319dcc1633fd864489bad8b9a3a206b6
-  data.tar.gz: 293bef927e2e02a2b136a8c23e5ade074a0efea8
+  metadata.gz: f4834d56fd4dadb1f4436611d0d1006b3b9874b6
+  data.tar.gz: bc07aa1726255dd1108232f1381e65a56c1dbd02
 SHA512:
-  metadata.gz: a0f0136f2c2c8bd84ddc0e00ca76a8f3bb00e10056e4fae8fd576cc105e89de64ee08a37077307ec876ab96bd41076565a032c3f53d88939feb1c5516ac9ab55
-  data.tar.gz: 8cac3ac7f967093b426cc026e9a09d691fdae0d262d80fbead60f1deda0e8ee944199f61a4b672ac7ecc09db113da2155504383852fed29c6c00f58d75f2700d
+  metadata.gz: 6f5a0682fd06cbcfa9cc6630e0e876ba842a795ce56c6c165664f8f4c57819f8353d45f9b9246909293a5612cc34726c7fafcaa176dcac38319f4587e196081f
+  data.tar.gz: 88e7e9f70551df5ed95f6b735f69f4a5bcb90a72a0b59052787ed446da102a953498ff2ab6a62455680c22f0e50802503d7f73114bcd5320a9290fd3de10a77b

data/.gitignore

@@ -7,5 +7,10 @@
 /pkg/
 /spec/reports/
 /tmp/
+lib/activefacts/cql/parser/[A-Z]*.rb
 *.swp
 clj
+.DS_Store
+*.rej
+*.orig
+*.diff

data/Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in activefacts-cql.gemspec
 gemspec
 
-if ENV['PWD'] =~ %r{\A/Users/cjh/work/activefacts}
+if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
+  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-cql"
   gem 'activefacts-api', path: '/Users/cjh/work/activefacts/api'
   gem 'activefacts-metamodel', path: '/Users/cjh/work/activefacts/metamodel'
   # gem 'activefacts-metamodel', git: 'git://github.com/cjheath/activefacts-metamodel.git'

data/activefacts-cql.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10.a"
+  spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency(%q<activefacts-metamodel>, [">= 1.7.0", "~> 1.7"])
+  spec.add_runtime_dependency("activefacts-metamodel", ">= 1.8", "~> 1.8.0")
   spec.add_runtime_dependency(%q<treetop>, [">= 1.4.14", "~> 1.4"])
 end
 

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

@@ -223,7 +223,7 @@ module ActiveFacts
           end
 
           @fact_type = @entity_type.fact_type = fact_type
-          @entity_type.create_implicit_fact_types # REVISIT: Could there be readings for the implicit fact types here?
+          @entity_type.create_link_fact_types # REVISIT: Could there be readings for the implicit fact types here?
           @fact_type
         end
 
@@ -238,58 +238,12 @@ module ActiveFacts
             # By default, the first supertype identifies this entity type
             is_identifying_supertype = !not_identifying && @entity_type.all_type_inheritance_as_subtype.size == 0
 
-            inheritance_fact = @constellation.TypeInheritance(@entity_type, supertype, :concept => :new)
-
 	    assimilation_pragmas = ['absorbed', 'separate', 'partitioned']
             assimilations = @pragmas.select { |p| assimilation_pragmas.include? p}
 	    @pragmas -= assimilation_pragmas
             raise "Conflicting assimilation pragmas #{assimilations*', '}" if assimilations.size > 1
-            inheritance_fact.assimilation = assimilations[0]
-
-            # Create a reading:
-            sub_role = @constellation.Role(inheritance_fact, 0, :object_type => @entity_type, :concept => :new)
-            super_role = @constellation.Role(inheritance_fact, 1, :object_type => supertype, :concept => :new)
-
-            rs = @constellation.RoleSequence(:new)
-            @constellation.RoleRef(rs, 0, :role => sub_role)
-            @constellation.RoleRef(rs, 1, :role => super_role)
-            @constellation.Reading(inheritance_fact, 0, :role_sequence => rs, :text => "{0} is a kind of {1}", :is_negative => false)
-
-            rs2 = @constellation.RoleSequence(:new)
-            @constellation.RoleRef(rs2, 0, :role => super_role)
-            @constellation.RoleRef(rs2, 1, :role => sub_role)
-            # Decide in which order to include is a/is an. Provide both, but in order.
-            n = 'aeioh'.include?(sub_role.object_type.name.downcase[0]) ? 'n' : ''
-            @constellation.Reading(inheritance_fact, 2, :role_sequence => rs2, :text => "{0} is a#{n} {1}", :is_negative => false)
-
-            if is_identifying_supertype
-              inheritance_fact.provides_identification = true
-            end
 
-            # Create uniqueness constraints over the subtyping fact type.
-            p1rs = @constellation.RoleSequence(:new)
-            @constellation.RoleRef(p1rs, 0).role = sub_role
-            pc1 = @constellation.PresenceConstraint(:new, :vocabulary => @vocabulary)
-            pc1.name = "#{@entity_type.name}MustHaveSupertype#{supertype.name}"
-            pc1.role_sequence = p1rs
-            pc1.is_mandatory = true   # A subtype instance must have a supertype instance
-            pc1.min_frequency = 1
-            pc1.max_frequency = 1
-            pc1.is_preferred_identifier = false
-	    trace :constraint, "Made new subtype PC GUID=#{pc1.concept.guid} min=1 max=1 over #{p1rs.describe}"
-
-            p2rs = @constellation.RoleSequence(:new)
-            constellation.RoleRef(p2rs, 0).role = super_role
-            pc2 = constellation.PresenceConstraint(:new, :vocabulary => @vocabulary)
-            pc2.name = "#{supertype.name}MayBeA#{@entity_type.name}"
-            pc2.role_sequence = p2rs
-            pc2.is_mandatory = false
-            pc2.min_frequency = 0
-            pc2.max_frequency = 1
-            # The supertype role often identifies the subtype:
-            pc2.is_preferred_identifier = inheritance_fact.provides_identification
-	    trace :supertype, "identification of #{@entity_type.name} via supertype #{supertype.name} was #{inheritance_fact.provides_identification ? '' : 'not '}added"
-	    trace :constraint, "Made new supertype PC GUID=#{pc2.concept.guid} min=1 max=1 over #{p2rs.describe}"
+	    @entity_type.add_supertype(supertype, is_identifying_supertype, assimilations[0])
           end
         end
 

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

@@ -105,7 +105,7 @@ module ActiveFacts
           # * Objectify the fact type if @name
           #
 
-	  # Prepare to objectify the fact type (so readings for implicit fact types can be created)
+	  # Prepare to objectify the fact type (so readings for link fact types can be created)
           if @name
 	    entity_type = @vocabulary.valid_entity_type_name(@name)
             raise "You can't objectify #{@name}, it already exists" if entity_type
@@ -120,8 +120,8 @@ module ActiveFacts
           return true unless @clauses.size > 0   # Nothing interesting was said.
 
 	  if @entity_type
-	    # Extract readings for implicit fact types
-	    @implicit_readings, @clauses =
+	    # Extract readings for link fact types
+	    @link_fact_type_clauses, @clauses =
 	      @clauses.partition do |clause|
 		clause.refs.size == 2 and clause.refs.detect{|ref| ref.player == @entity_type}
 	      end
@@ -137,7 +137,6 @@ module ActiveFacts
             @fact_type = first_clause.make_fact_type(@vocabulary)
             first_clause.make_reading(@vocabulary, @fact_type)
             first_clause.make_embedded_constraints vocabulary
-            @fact_type.create_implicit_fact_type_for_unary if @fact_type.all_role.size == 1 && !@name
             @existing_clauses = [first_clause]
           elsif (n = @clauses.size - @existing_clauses.size) > 0
 	    raise "Cannot extend a negated fact type" if @existing_clauses.detect {|clause| clause.certainty == false }
@@ -164,8 +163,8 @@ module ActiveFacts
             if @fact_type.entity_type and @name != @fact_type.entity_type.name
               raise "Cannot objectify fact type as #{@name} and as #{@fact_type.entity_type.name}"
             end
-            ifts = @entity_type.create_implicit_fact_types
-	    create_implicit_readings(ifts)
+            ifts = @entity_type.create_link_fact_types
+	    create_link_fact_type_readings(ifts)
             if @pragmas
               @entity_type.is_independent = true if @pragmas.delete('independent')
             end
@@ -193,25 +192,24 @@ module ActiveFacts
           @fact_type
         end
 
-	def create_implicit_readings(ifts)
-	  @implicit_readings.each do |clause|
+	def create_link_fact_type_readings(ifts)
+	  @link_fact_type_clauses.each do |clause|
 	    #next false unless clause.refs.size == 2 and clause.refs.detect{|r| r.role.object_type == @entity_type }
 	    other_ref = clause.refs.detect{|ref| ref.player != @entity_type}
 	    ift = ifts.detect do |ift|
 	      other_ref.binding.refs.map{|r| r.role}.include?(ift.implying_role)
 	    end
-	    next unless ift
-	    # This clause is a reading for the implicit LinkFactType ift
+	    unless ift
+	      raise "Clause #{clause} in unmatched in definition of objectified fact type #{@name}"
+	      next
+	    end
+	    # This clause is a reading for the LinkFactType ift
 	    i = 0
 	    reading_text = clause.phrases.map do |phrase|
 		next phrase if String === phrase
 		"{#{(i += 1)-1}}"
 	      end*' '
-	    ir = ActiveFacts::Metamodel::LinkFactType::ImplicitReading
-	    irrs = ir::ImplicitReadingRoleSequence
-	    irrf = irrs::ImplicitReadingRoleRef
-	    reading = ir.new(ift, reading_text)
-	    ift.add_reading reading
+	    clause.make_reading(@vocabulary, ift)
 	  end
 	end
 

data/lib/activefacts/cql/verbaliser.rb

@@ -720,7 +720,7 @@ module ActiveFacts
               if next_step.is_unary_step
                 # Objectified unaries get emitted as unaries, not as objectifications:
                 role = next_step.input_play.role
-                role = role.fact_type.implying_role if role.fact_type.is_a?(LinkFactType)
+                role = role.fact_type.implying_role if role.fact_type.is_a?(ActiveFacts::Metamodel::LinkFactType)
 		next_reading = role.fact_type.preferred_reading(next_step.is_disallowed) || role.fact_type.preferred_reading
                 readings += " and " unless readings.empty?
 		readings += "it is not the case that " if !next_step.is_disallowed != !next_reading.is_negative

data/lib/activefacts/cql/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module CQL
-    VERSION = "1.7.1"
+    VERSION = "1.8.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-cql
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.a
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.a
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,36 +48,36 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: activefacts-metamodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement