activefacts 0.8.16 → 0.8.18

data/examples/CQL/MonthInSeason.cql

@@ -18,10 +18,6 @@ Occurrence is where
 /*
  * Fact Types
  */
-Month is in at most one Season;
+Month is in at most one Season,
+	Season contains at least one Month;
 
-/*
- * Constraints:
- */
-each Season occurs at least one time in
-	Month is in Season;

data/examples/CQL/SeparateSubtype.cql

@@ -5,24 +5,26 @@ vocabulary SeparateSubtype;
  */
 Claim ID is written as Auto Counter;
 Date Time is written as Date Time;
-Driver Name is written as String;
+Person Name is written as String;
 
 /*
  * Entity Types
  */
 Claim is identified by its ID;
 
-Driver is identified by its Name;
-
 Incident is identified by Claim where
-	Claim concerns at most one Incident;
+	Claim concerns at most one Incident,
+	Incident resulted in one Claim;
 Incident occurred on at most one Date Time;
 
+Person is identified by its Name;
+
 Vehicle Incident is a kind of Incident [separate];
+
+Witness is a kind of Person;
+Witness saw Incident,
+	Incident was seen by at most one Witness;
+
+Driver is a kind of Person;
 Vehicle Incident occured while at most one Driver was in charge;
 
-/*
- * Constraints:
- */
-each Incident occurs one time in
-	Claim concerns Incident;

data/examples/CQL/ServiceDirector.cql

@@ -5,13 +5,12 @@ vocabulary ServiceDirector;
  */
 Company Code is written as Char(5);
 Credential Nr is written as Signed Integer(32);
-DDMMYYYY is written as Date;
 Data Store Name is written as String(15);
+Date is written as String;
+Date Time is written as String;
 Email Address is written as String(50);
-HHMMSS is written as Time;
 Host System Name is written as String(15);
 IP is written as String(16);
-MDYHMS is written as Auto Time Stamp;
 Message Data is written as Blob(8000);
 Message Header is written as String(30);
 Monitor Id is written as Auto Counter;
@@ -32,6 +31,7 @@ Serial Number is written as String(20);
 Service Type [independent] is written as String(15);
 Subscription Nr is written as Signed Integer(32);
 Switch Id is written as Auto Counter;
+Time is written as String;
 Transaction Nr is written as Unsigned Integer(32);
 Truck PCID is written as Unsigned Integer(32);
 User Name is written as String(20);
@@ -46,27 +46,19 @@ Company is client;
 Company is vendor;
 
 Credential is identified by its Nr;
+Credential has at most one Expiration-Date;
 Credential has one Password;
 Credential has one User Name;
 
 Data Store is identified by its Name;
 Data Store requires at least one Credential;
 Data Store has one Friendly-Name;
-Data Store has at most one Heart- Beat Truck PCID;
+Data Store has at most one HeartBeat-Truck PCID;
 Data Store has one Internal-Credential;
 Data Store is one Major-Version;
 Data Store is one Minor-Version;
 Data Store is one Revision-Version;
 
-Date Time YMDHMS is identified by MDYHMS where
-	Date Time YMDHMS has one MDYHMS,
-	MDYHMS is of at most one Date Time YMDHMS;
-
-DateYYMMDD is identified by DDMMYYYY where
-	DateYYMMDD has one DDMMYYYY,
-	DDMMYYYY is of at most one DateYYMMDD;
-Credential has at most one Expiration-DateYYMMDD;
-
 Duration is identified by Seconds where
 	Duration has one Seconds,
 	Seconds is of at most one Duration;
@@ -89,8 +81,8 @@ Monitor is owned by one Monitoring Application;
 
 Network is identified by its Nr;
 Company has at least one Origin-Network;
-Data Store has Tcp- Proxy Network,
-	Tcp- Proxy Network is in at most one Data Store;
+Data Store has TcpProxy-Network,
+	TcpProxy-Network is in at most one Data Store;
 Host System uses at least one Network,
 	Network is used by at most one Host System;
 Network uses at most one Domain-Name;
@@ -102,7 +94,7 @@ Network is ip_single;
 Network is ip_subnet;
 
 Notification Level is identified by its Nr;
-Notification Level has one Initial- Delay Duration;
+Notification Level has one InitialDelay-Duration;
 Notification Level has one Repeat-Duration;
 
 Notification Type is independent identified by its Name;
@@ -110,12 +102,13 @@ Notification Type is independent identified by its Name;
 Provider Type is identified by its Id;
 
 Recurring Schedule is identified by its Id;
-Monitor has All- Exclusion Recurring Schedule,
-	All- Exclusion Recurring Schedule applies to at most one Monitor;
-Monitor (as IntegratingMonitor) has Integration- Exclusion Recurring Schedule;  // Avoid ambiguity; this is a new fact type
-Monitor (as IntegratingMonitor) has Integration- Exclusion Recurring Schedule,
-	Integration- Exclusion Recurring Schedule applies to at most one IntegratingMonitor;
+Monitor has AllExclusion-Recurring Schedule,
+	AllExclusion-Recurring Schedule applies to at most one Monitor;
+Monitor (as IntegratingMonitor) has IntegrationExclusion-Recurring Schedule;  // Avoid ambiguity; this is a new fact type
+Monitor (as IntegratingMonitor) has IntegrationExclusion-Recurring Schedule,
+	IntegrationExclusion-Recurring Schedule applies to at most one IntegratingMonitor;
 Recurring Schedule has one Duration;
+Recurring Schedule has one Start-Time;
 Recurring Schedule friday;
 Recurring Schedule monday;
 Recurring Schedule saturday;
@@ -130,12 +123,12 @@ Satellite Message has at most one Message Data;
 Satellite Message has at most one Message Header;
 Satellite Message is of at most one Provider Type;
 Satellite Message has one Serial Number;
-Satellite Message has one insertion-Date Time YMDHMS;
+Satellite Message has one insertion-Date Time;
 
 Subscription is identified by its Nr;
-Company has one Driver- Tech Subscription;
-Subscription has one Beginning-DateYYMMDD;
-Subscription has at most one Ending-DateYYMMDD;
+Company has one DriverTech-Subscription;
+Subscription has one Beginning-Date;
+Subscription has at most one Ending-Date;
 Subscription is enabled;
 
 Switch is identified by its Id;
@@ -155,11 +148,6 @@ Switch is backup updates;
 Switch is send disabled;
 Switch is test vectors enabled;
 
-TimeHMS is identified by HHMMSS where
-	TimeHMS has one HHMMSS,
-	HHMMSS is of at most one TimeHMS;
-Recurring Schedule has one Start-TimeHMS;
-
 Transaction is identified by its Nr;
 Satellite Message has at most one Group-Transaction;
 
@@ -218,7 +206,7 @@ for each Credential exactly one of these holds:
 for each Network exactly one of these holds:
 	Network is used by Host System,
 	Company has Origin-Network,
-	Tcp- Proxy Network is in Data Store;
+	TcpProxy-Network is in Data Store;
 for each Network exactly one of these holds:
 	Network is ip_single,
 	Network is ip_subnet,
@@ -241,7 +229,7 @@ Switch is on private Network
 	Data Store has Legacy Switch;
 Client has default Data Store
 	only if Client uses Data Store;
-Tcp Proxy Network is in Data Store
+TcpProxy Network is in Data Store
 	only if Network is ip_single;
 Network uses Domain Name
 	only if Network is ip_single;
@@ -276,7 +264,7 @@ each Recurring Schedule occurs at least one time in
 each Service occurs one time in
 	Vendor provides Service;
 each Subscription occurs at most one time in
-	Company has Driver Tech Subscription;
+	Company has DriverTech Subscription;
 each Subscription occurs at most one time in
 	Data Store Service has Subscription;
 each Switch occurs at most one time in

data/examples/CQL/Supervision.cql

@@ -32,6 +32,3 @@ either Employee reports to Manager(1) or Employee is a Manager(2) that is a CEO
 Employee is a Manager that is a CEO that runs Company
 	if and only if
 	Employee works for Company;
-Employee(1) reports to Manager that is a kind of Employee(2) that works for Company
-	if and only if
-	Employee(1) works for Company;

data/examples/CQL/WindowInRoomInBldg.cql

@@ -3,7 +3,7 @@ vocabulary WindowInRoomInBldg;
 /*
  * Value Types
  */
-Building is written as Signed Integer(32);
+Building Number is written as Signed Integer(32);
 Room Number is written as Signed Integer(32);
 Wall Number is written as Signed Integer(32);
 Window Number is written as Unsigned Integer(32);
@@ -11,12 +11,18 @@ Window Number is written as Unsigned Integer(32);
 /*
  * Entity Types
  */
+Building is identified by its Number;
+
 Room is identified by Building and Room Number where
 	Room is in one Building,
 	Room has one Room Number;
 
-Window is identified by Room and Wall Number and Window Number where
-	Window is in one Room,
-	Window is located in one Wall Number,
+Wall is identified by Room and Wall Number where
+	Wall is in one Room,
+	Room contains Wall,
+	Wall has one Wall Number;
+
+Window is identified by Wall and Window Number where
+	Window is located in one Wall,
 	Window has one Window Number;
 

data/examples/CQL/unit.cql

@@ -80,7 +80,7 @@ vocabulary Units;
 1 pennyweight converts to pwt;
 100.0 kg converts to quintal;
 25.0 converts to quire;
-0.5 pi converts to radian;
+0.5 pi^-1 converts to radian;
 500.0 converts to ream;
 1 converts to sec;
 1 sec converts to second;

data/lib/activefacts.rb

@@ -9,3 +9,4 @@ require 'rubygems'
 require 'activefacts/version'
 require 'activefacts/support'
 require 'activefacts/api'
+require 'activefacts/registry'

data/lib/activefacts/cql/CQLParser.treetop

@@ -8,7 +8,6 @@ module ActiveFacts
   module CQL
     grammar CQL
       include LexicalRules
-      include Language        # One of the language modules provides this module
       include Expressions
       include Terms
       include ObjectTypes
@@ -110,6 +109,11 @@ module ActiveFacts
 	  }
       end
 
+      # An enforcement action, like SMS, email, log, alarm, etc.
+      rule action
+	id
+      end
+
       # presence constraint:
       rule presence_constraint
 	(each_occurs_in_clauses / either_or)

data/lib/activefacts/cql/Context.treetop

@@ -9,8 +9,8 @@ module ActiveFacts
     grammar Context
       rule context_note
         '('
-        w:who_says? s context_type discussion agreed:(',' a:as_agreed_by)? s
-        ')'
+        s w:who_says? s context_type discussion agreed:(',' a:as_agreed_by)? s
+        ')' s
         {
 	  def value
 	    [ w.empty? ? nil : w.value, context_type.value, discussion.text_value, agreed.empty? ? [] : agreed.a.value]
@@ -35,11 +35,6 @@ module ActiveFacts
         to_avoid        { def value; 'to_avoid'; end }
       end
 
-      # An enforcement action, like SMS, email, log, alarm, etc.
-      rule action
-	id
-      end
-
       rule discussion
         (
 	  '(' discussion ')' / (!( [()] / ',' as_agreed_by) .)*

data/lib/activefacts/cql/Expressions.treetop

@@ -53,11 +53,11 @@ module ActiveFacts
       end
 
       rule derived_variable
-        variable:term s role_id:(role_name / subscript )?
+        derived:term s role_id:(role_name / subscript )?
         {
 	  def ast quantifier = nil, value_constraint = nil, literal = nil, nested_clauses = nil
 	    role_name = role_id.empty? ? nil : role_id.value
-	    variable.ast(quantifier, nil, role_name, value_constraint, literal, nested_clauses)
+	    derived.ast(quantifier, nil, role_name, value_constraint, literal, nested_clauses)
 	  end
         }
       end

data/lib/activefacts/cql/FactTypes.treetop

@@ -8,15 +8,16 @@ module ActiveFacts
   module CQL
     grammar FactTypes
       rule query
-	s joined_clauses r:returning_clause? '?'
+	s query_clauses r:returning_clause? '?'
 	{
 	  def ast
-	    Compiler::FactType.new nil, [], joined_clauses.ast, (r.empty? ? nil : r)
+	    Compiler::FactType.new nil, [], query_clauses.ast, (r.empty? ? nil : r)
 	  end
 	}
       end
 
       rule named_fact_type
+	s each?
         s term_definition_name
         mapping_pragmas is_where
         anonymous_fact_type
@@ -33,13 +34,13 @@ module ActiveFacts
       end
 
       rule anonymous_fact_type
-        joined_clauses
-          ctail:( (':' / where) s a:joined_clauses s)?
+        query_clauses
+          ctail:( (':' / where) s a:query_clauses s)?
           returning_clause?
         s ';'
         {
 	  def ast
-            clauses_ast = joined_clauses.ast
+            clauses_ast = query_clauses.ast
             conditions = !ctail.empty? ? ctail.a.ast : []
 	    returning = respond_to?(:returning_clause) ? returning_clause.ast : nil
 	    value_derivation = clauses_ast.detect{|r| r.is_equality_comparison}
@@ -51,7 +52,7 @@ module ActiveFacts
 	    elsif (clauses_ast.size == 1 &&
 	      clauses_ast[0].phrases.size == 1 &&
 	      (popname = clauses_ast[0].phrases[0]) &&
-	      !popname.is_a?(Compiler::VarRef) &&
+	      !popname.is_a?(Compiler::Reference) &&
 	      conditions.detect{|r| r.includes_literals}
 	    )
 	      Compiler::Fact.new conditions, popname
@@ -62,7 +63,7 @@ module ActiveFacts
         }
       end
 
-      rule joined_clauses
+      rule query_clauses
         qualified_clauses
 	  # REVISIT: This creates no precedence between and/or, which could cause confusion.
 	  # Should disallow mixed conjuntions - using a sempred?
@@ -89,14 +90,14 @@ module ActiveFacts
       end
 
       rule qualified_clauses
-        s q:qualifier? s contracted_clauses s p:post_qualifiers? s c:context_note?
+        s certainty s contracted_clauses s p:post_qualifiers? s c:context_note?
         {
 	  def ast(conjunction = nil)
 	    r = contracted_clauses.ast	# An array of clause asts
 	    r[0].conjunction = conjunction
 	    # pre-qualifiers apply to the first clause, post_qualifiers and context_note to the last
 	    # REVISIT: This may be incorrect where the last is a nested clause
-	    r[0].qualifiers << q.text_value unless q.empty?
+	    r[0].certainty = certainty.value
 	    r[-1].qualifiers += p.list unless p.empty?
 	    r[-1].context_note = c.ast unless c.empty?
 	    r
@@ -104,8 +105,14 @@ module ActiveFacts
         }
       end
 
-      rule qualifier
-        maybe / definitely
+      rule certainty
+	negative_prefix { def value; false; end }
+	/
+        maybe { def value; nil; end }
+	/
+	definitely { def value; true; end }
+	/
+	'' { def value; true; end }
       end
 
       rule post_qualifiers
@@ -119,7 +126,7 @@ module ActiveFacts
 
       rule post_qualifier
         static / transient /
-	intransitive / transitive / acyclic / symmetric / asymmetric / antisymmetric / reflexive / irreflexive
+	intransitive / stronglyintransitive / transitive / acyclic / symmetric / asymmetric / antisymmetric / reflexive / irreflexive
       end
 
       rule clauses_list
@@ -173,7 +180,7 @@ module ActiveFacts
       end
 
       rule reading_contraction
-	role p:post_qualifiers? conjunction:(that/who) s q:qualifier? s contracted_clauses s
+	role p:post_qualifiers? conjunction:(that/who) s certainty s contracted_clauses s
 	{
 	  def ast
 	    # contracted_clauses.ast will return an array of Clauses, but the first clause is special. We must:
@@ -182,7 +189,7 @@ module ActiveFacts
 	    clauses_ast = contracted_clauses.ast
 	    clauses_ast[0].conjunction = conjunction.text_value
 	    clauses_ast[0].phrases.unshift(role.ast)
-	    clauses_ast[0].qualifiers << q.text_value unless q.empty?  # Add maybe/definitely
+	    clauses_ast[0].certainty = certainty.value
 
 	    # A contraction returns an array containing:
 	    # * a role AST
@@ -194,11 +201,11 @@ module ActiveFacts
       end
 
       rule condition_contraction
-	role pq:post_qualifiers? q:qualifier? s comparator s e2:expression
+	role pq:post_qualifiers? certainty s comparator s e2:expression
 	  !phrase	  # The contracted_clauses must not continue here!
 	{
 	  def ast
-	    c = Compiler::Comparison.new(comparator.text_value, role.ast, e2.ast, q.empty? ? [] : [q.text_value])
+	    c = Compiler::Comparison.new(comparator.text_value, role.ast, e2.ast, certainty.value)
 	    c.conjunction = comparator.text_value
 	    [ role.ast, pq.empty? ? [] : pq.list, c ]
 	  end
@@ -206,22 +213,22 @@ module ActiveFacts
       end
 
       rule comparison
-	e1:expression s q:qualifier? s comparator s contraction p:post_qualifiers?
+	e1:expression s certainty s comparator s contraction p:post_qualifiers?
 	{
 	  def ast
 	    role, qualifiers, *clauses_ast = *contraction.ast
 	    clauses_ast[0].qualifiers += p.list unless p.empty?	# apply post_qualifiers to the contracted clause
 	    # clauses_ast[0].conjunction = 'and' # AND is implicit for a contraction
-	    c = Compiler::Comparison.new(comparator.text_value, e1.ast, role)
-	    c.qualifiers << q.text_value unless q.empty?
+	    c = Compiler::Comparison.new(comparator.text_value, e1.ast, role, certainty.value)
 	    [c] + clauses_ast
 	  end
 	}
         /
-	q:qualifier? e1:expression s comparator s e2:expression # comparisons have no post-qualifiers: p:post_qualifiers?
+	certainty e1:expression s comparator s e2:expression # comparisons have no post-qualifiers: p:post_qualifiers?
         {
 	  def ast
-	    [Compiler::Comparison.new(comparator.text_value, e1.ast, e2.ast, q.empty? ? [] : [q.text_value])]
+	    c = Compiler::Comparison.new(comparator.text_value, e1.ast, e2.ast, certainty.value)
+	    [c]
 	  end
         }
       end
@@ -257,13 +264,12 @@ module ActiveFacts
       end
 
       rule aggregate
-	aggregate:id s of s term s	# REVISIT: this term may need to pre-scanned in the qualified_clauses
-	in s '('
-	  qualified_clauses	# REVISIT: Need to test to verify this is the right level (not joined_clauses, etc)
-	s ')'
+	aggregate:id s
+	agg_of s term_or_unary s agg_in s    # REVISIT: this term may need to pre-scanned in the qualified_clauses
+	'(' qualified_clauses s ')' # REVISIT: Need to test to verify this is the right level (not query_clauses, etc)
 	{
 	  def ast
-	    raise "Not implemented: AST for '#{aggregate.text_value} of #{term.text_value}'"
+	    raise "Not implemented: AST for '#{aggregate.text_value} of #{term_or_unary.text_value}'"
 	    # This returns just the role with the nested clauses, which doesn't even work:
 	    term.ast(
 	      nil,	# No quantifier
@@ -279,14 +285,14 @@ module ActiveFacts
 
       # This is the rule that causes most back-tracking. I think you can see why.
       rule simple_role
-	q:(quantifier enforcement cn:context_note?)?
+	q:( quantifier enforcement cn:context_note? )?
         player:derived_variable
         lr:(
 	  literal u:unit?
 	  /
 	  value_constraint enforcement
 	)?
-	oj:objectification_join?
+	oj:objectification_step?
         {
 	  def ast
 	    if !q.empty? && q.quantifier.value
@@ -301,7 +307,7 @@ module ActiveFacts
 	      if lr.respond_to?(:literal)
 		literal = Compiler::Literal.new(lr.literal.value, lr.u.empty? ? nil : lr.u.text_value)
 	      end
-	      value_constraint = Compiler::ValueConstraint.new(lr.value_constraint.ranges, lr.value_constraint.units, lr.enforcement.ast) if lr.respond_to?(:value_constraint)
+	      value_constraint = Compiler::ValueConstraint.new(lr.value_constraint.ast, lr.enforcement.ast) if lr.respond_to?(:value_constraint)
 	      raise "It is not permitted to provide both a literal value and a value constraint" if value_constraint and literal
 	    end
 
@@ -318,8 +324,8 @@ module ActiveFacts
         }
       end
 
-      rule objectification_join
-        '(' s in_which s facts:joined_clauses s ')' s
+      rule objectification_step
+        '(' s in_which s facts:query_clauses s ')' s
 	{
 	  def ast
 	    facts.ast