activefacts 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e791a369dca69a80ccd666e7eec9441e9f00483
-  data.tar.gz: d894b07ab82cfdf942a8e93561fa86a8a3bedd8a
+  metadata.gz: 8ed82ab2bf0c4e8d8dc9fce824d69e9fff87ab0b
+  data.tar.gz: 03644b12bd3d6717a457a7526342b797966fb712
 SHA512:
-  metadata.gz: c5f05a7b8b3b116f478b55819baba8162b12c8807122f9825474c93819a9f0f3255dd5c2040eaf54dd59e6e445c5572bcd1d82267d3b9312af140ae8b51d8ce5
-  data.tar.gz: e6d40c1c950bbca20c96700002c88fa640c1a019c3dfe72b4e88da5a549d401d6d5d87eead9c20d6ced53c688750f7458f2ae598181a6a9c02d84775c6407ca4
+  metadata.gz: 07c66c621a9009612baa4e90abfb03dfee833e8daba654089f75f80ee14fe2881aab1e7e9e90c0b55109f80e5472cc7a05bde2f9dc1d1534ae3357e4097bcf8a
+  data.tar.gz: d10faaa64f3c03eacc742888310a0ddb88158e9de646c80c3176040e970bf61e5e67f6a81d014b7acc794b8c91bf27f874391ef0c6b7a66d6210176b10bf0171

data/bin/cql

@@ -9,6 +9,7 @@ require 'readline'
 
 require 'activefacts'
 require 'activefacts/cql/compiler'
+require 'activefacts/vocabulary/query_evaluator'
 
 class InteractiveCQL < ActiveFacts::CQL::Compiler
   def initialize *a
@@ -16,6 +17,7 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
     @show_highlight = false  # Show the highlighted CQL text from the parse tree
     super *a
     self.root = :definition
+    @population_name = ''	# Use the default population
   end
 
   def add_logger logger
@@ -70,20 +72,20 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
 
   def metacommand(line)
     # meta-commands start with /
-    words = line.split
-    case cmd = words.shift
-    when "/trace"
-      if words.empty?
-	puts trace_keys*", "
-      else
-	toggle_trace words
-      end
-    when "/tree"
-      @show_tree = !@show_tree
-      puts "Will #{@show_tree ? "" : "not "}show the parse tree"
+    cmd = line.sub(/(\A\/\p{Alpha}*).*/,'\1')
+    words = line[cmd.size..-1].split
+    case cmd
+    when "/about"
+      list_connotations (words*' ')
+    when "/cql"
+      process(words*' ')
     when "/highlight"
       @show_highlight = !@show_highlight
       puts "Will #{@show_highlight ? "" : "not "}show the highlighted parse"
+    when "/list"
+      list_object_types
+    when "/load"
+      load_file(words*' ')
     when "/log"
       @logger ||= proc {|*a|
 	unless @undoing
@@ -91,26 +93,42 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
 	end
       }
       add_logger @logger
-    when "/timings"
-      $show_timings = !$show_timings
-      puts "Will #{$show_timings ? "" : "not "}show command timings"
+    when "/population"
+      # REVISIT: Set default population for queries
+      if words == ['?']
+	puts "Defined populations are: "+@constellation.Population.keys.map{|v, p| p.empty? ? "<default>" : p}*', '
+      else
+	@population_name = words[0] || ''
+	@vocabulary = @constellation.Vocabulary.values.first
+	@population =
+	  if @vocabulary
+	    @constellation.Population[[[@vocabulary.name], @population_name]]
+	  else
+	    nil
+	  end
+	puts "Using #{@population ? 'existing ' : ''}population #{@population_name}"
+      end
     when "/root"
       self.root = words[0] && words[0].to_sym || :definition
       puts "Looking for a #{self.root}"
-    when "/list"
-      list_object_types
-    when "/about"
-      words.each do |word|
-	list_connotations word
+    when "/timings"
+      $show_timings = !$show_timings
+      puts "Will #{$show_timings ? "" : "not "}show command timings"
+    when "/trace"
+      if words.empty?
+	puts trace_keys*", "
+      else
+	toggle_trace words
       end
-    when "/load"
-      load_file(words*' ')
+    when "/tree"
+      @show_tree = !@show_tree
+      puts "Will #{@show_tree ? "" : "not "}show the parse tree"
     when "/quit"
       exit
     when "/help", "/"
       help words
     else
-      puts "Unknown metacommand #{line}?"
+      puts "Unknown metacommand #{line}"
       help
     end
   end
@@ -130,53 +148,67 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
     end
   end
 
-  def process_query(query)
-    result_projection = {}  # A set of {hash of Variable to Instance}
-    query_block =
-      proc do |unbound_variables = [], bindings = {}|
-	# unbound_variables is an array of the remaining dimensions of the search
-	# bindings is a hash of Varable to Instance
-	next_variable = unbound_variables[0]
-	if next_variable
-	  ins = next_variable.object_type.all_instance
-	  trace :result, "Query search through #{ins.size} #{next_variable.role_name || next_variable.object_type.name}" do
-	    next_variable.object_type.all_instance.each do |instance|
-	      trace :result, "Considering #{instance.verbalise}"
-	      # REVISIT: Check whether this instance satisfies the query steps that contain the bound variables
-	      (b = bindings.dup).store(next_variable, instance)
-	      result_projection[b] = true
-	      query_block.call(unbound_variables[1..-1], b)
-	    end
-	  end
-	end
+  def query(query)
+    @population = @constellation.Population[[[@vocabulary.name], @population_name]]
+    unless @population
+      puts "Population #{@population_name.inspect} has not yet been instantiated"
+      return
+    end
+
+    q = ActiveFacts::Metamodel::QueryEvaluator.new(query, @population)
+    results = q.evaluate
+    verbalise_results(q, results)
+  end
+
+  def verbalise_results(q, results)
+    trace :result, "Found #{results.size} results:"
+    if q.free_variables.size == 0
+      if results.size > 0
+	puts "Yes."
+      else
+	puts "No."
       end
+      return
+    end
 
-    unbound_variables = query.all_variable.to_a
-    bound_variables = {}
-    unbound_variables.reject!{|v| v.value != nil ? bound_variables[v] = v.value : nil }
-    print 'bound variables: '; p bound_variables.keys.map{|v| [v.object_type.name, v.value.inspect] }
-    print 'unbound variables: '; p unbound_variables.map{|v| v.object_type.name} 
+    return if verbalise_single_fact_result(q, results)
 
-    query_block.call(unbound_variables, {})
-    result_projection.map do |result, _|
-      puts(result.map{|v, i| i.verbalise }.join(', '))
+    # No smart verbalisation for this scenario, just show the variable values:
+    results.map do |result, _|
+      puts(result.map{|var, i| i.verbalise }.join(', '))
     end
+  end
 
-=begin
-    if query.all_variable.size == 1 and
-    	(v = query.all_variable.single).all_play.map{|p| p.all_step.to_a}.flatten.uniq.size == 0
-      if v.object_type.all_instance.size == 0
-	puts "There are no instances of #{v.object_type.name}"
-      else
-	list_instances(v.object_type)
+  def verbalise_single_fact_result(q, results)
+    # If all unbound variables play in the same step, just expand the fact type's reading with the values
+    # REVISIT: Ignore steps over facts that are existential for other variable's object types
+    trace :result, "Attempting single fact verbalisation" do
+      common_steps =
+	q.free_variables.inject(nil) do |memo, var|
+	  steps = (var.all_play.map{|p| p.step} + Array(var.step)).uniq
+	  trace :result, "variable #{var.object_type.name} spans steps #{steps.map(&:fact_type).map(&:default_reading).inspect}"
+	  steps.reject! do |step|
+	    step.fact_type.is_existential
+	  end
+	  memo ? memo & steps : steps
+	end
+      trace :result, "There are #{common_steps.size} common steps for attempted single fact verbalisation"
+      if step = common_steps[0]
+	reading = step.fact_type.preferred_reading
+	reading_roles = reading.role_sequence.all_role_ref_in_order.map(&:role)
+	reading_variables = reading_roles.map { |role| step.all_play.detect{|p| p.role == role}.variable }
+
+	results.map do |result, _|
+	  # Verbalise result the fact, don't just dump the variable values
+	  literals = reading_variables.map{|v| [nil, result[v].verbalise] }
+	  puts (step.is_disallowed ? 'it is not the case that ' : '') +
+	    reading.expand(literals) +
+	    ';'
+	end
+	return true
       end
-    else
-      # REVISIT: Identify all the unbound Variables, and do a nested-loops iteration checking all Steps
-      puts "Can't yet process complex queries (involving #{
-	  query.all_variable.map{|v| v.object_type.name}
-	}*', '})"
+      return false
     end
-=end
   end
 
   def process(statement)
@@ -184,7 +216,7 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
       @results = []
       compile(statement)
       if @results.size == 1 && @results[0].is_a?(ActiveFacts::Metamodel::Query)
-	process_query(@results[0])
+	query(@results[0])
       else
 	puts(@results.map{|r| "\t"+r.inspect}*"\n")
       end
@@ -278,16 +310,21 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
       puts %Q{
 Meta-commands are:
   /about term\t\tDisplay the fact types in which term plays a part
-  /help\t\t\tThis help message
+  /cql text\t\tProcess this single CQL definition or query
   /help topic\t\thelp on a specific topic
   /help topics\t\tList the available help topics
-  /highlight\t\t\tRe-display the parsed CQL with HTML highlighting markup
+  /help\t\t\tThis help message
+  /highlight\t\tRe-display the parsed CQL with HTML highlighting markup
   /list\t\t\tList all object type names (terms)
   /load file.cql\tLoad a CQL file
+  /population [? | name] List or set the active population
+  /quit\t\t\tExit CQL
   /root rule\t\tParse just a fragment of a CQL statement, matching syntax rule only
-  /timings\t\t\tDisplay the elapsed time to execute each command
-  /tree\t\t\tDisplay the abstract syntax tree from each statement parsed
+  /timings\t\tDisplay the elapsed time to execute each command
   /trace key\t\tToggle tracing key, or list available keys
+  /tree\t\t\tDisplay the abstract syntax tree from each statement parsed
+
+Meta-commands are available on the shell command-line - use -- instead of /
 }
     else
       words.each do |word|
@@ -503,34 +540,43 @@ end
 compiler = InteractiveCQL.new
 statement = nil
 loaded_files = false
-ARGV.each do |arg|
+args = ARGV.dup
+while !args.empty?
+  arg = args.shift    # Gather up the arguments until the next one starting with -
   if arg =~ /^--(.*)/
-    compiler.metacommand('/'+$1)
-  else
-    loaded_files = false or break if arg == '-'
+    arg = '/'+$1
+    while args[0] and args[0] !~ /^-/
+      arg = arg+' '+args.shift
+    end
+    compiler.metacommand arg
+  elsif arg == '-'  # Either "stdin" or immediate-command
+    unless args.empty?
+      compiler.process args*' '
+      exit
+    end
+    break
+  else		      # Just a file
     compiler.load_file(arg)
-    loaded_files = true
+    exit if args.empty?
   end
 end
 
-if !loaded_files
-  puts "Enter / for help on special commands"
-
-  while line = Readline::readline(statement ? "CQL+ " : "CQL? ", [])
-    statement = statement ? statement + "\n"+line : line
-    start = Time.now
-    case
-    when line =~ %r{\A/}
-      compiler.metacommand(line)
-      statement = nil
-    when compiler.root != :definition || line.gsub(/(['"])([^\1\\]|\\.)*\1/,'') =~ /[;?]/
-      # After stripping string literals the line contains a ';' or /?', we've found the last line of the command:
-      compiler.process(statement)
-      statement = nil
-    end
-    if $show_timings && statement == nil
-      puts "Done in #{((Time.now.to_f-start.to_f)*1000000).to_i} usec"
-    end
+puts "Enter / for help on special commands"
+
+while line = Readline::readline(statement ? "CQL+ " : "CQL? ", [])
+  statement = statement ? statement + "\n"+line : line
+  start = Time.now
+  case
+  when line =~ %r{\A/}
+    compiler.metacommand(line)
+    statement = nil
+  when compiler.root != :definition || line.gsub(/(['"])([^\1\\]|\\.)*\1/,'') =~ /[;?]/
+    # After stripping string literals the line contains a ';' or /?', we've found the last line of the command:
+    compiler.process(statement)
+    statement = nil
+  end
+  if $show_timings && statement == nil
+    puts "Done in #{((Time.now.to_f-start.to_f)*1000000).to_i} usec"
   end
-  puts
 end
+puts

data/css/style.css

@@ -328,14 +328,14 @@ tt,
 code,
 pre
 {
-  font-family      : Consolas, "Lucida Console", monospace;
+  font-family      : monospace;
 }
 
 tt
 {
   font-weight      : bold;
-  color            : #A52A2A;
-  background-color : #FFFAF0;
+/*  color            : #A52A2A; */
+/*  background-color : #FFFAF0; */
 }
 
 /* output of syntax colorizer */

data/examples/CQL/Insurance.cql

@@ -162,7 +162,7 @@ Vehicle Type is identified by Make and Model and Badge where
 Vehicle is of one Vehicle Type;
 
 Witness is identified by Incident and Name where
-	Incident was seen by Witness,
+	Incident was independently witnessed by Witness,
 	Witness saw one Incident,
 	Witness is called one Name;
 Witness has at most one contact-Phone;

data/examples/CQL/SeparateSubtype.cql

@@ -23,8 +23,8 @@ 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;
+	Incident was independently witnessed by at most one Witness;
 
 Driver is a kind of Person;
-Vehicle Incident occured while at most one Driver was in charge;
+Vehicle Incident occurred while at most one Driver was in charge;
 

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

@@ -14,6 +14,15 @@ module ActiveFacts
         s 'is' s 'written' S as s
       end
 
+      rule auto_assignment
+	'auto-assigned' S at s time:('assert' / 'commit') !alphanumeric s
+	{
+	  def auto_assigned_at
+	    time.text_value
+	  end
+	}
+      end
+
       # The pattern to introduce an Entity Type
       rule identified_by
         identified s by s

data/lib/activefacts/cql/ObjectTypes.treetop

@@ -160,7 +160,7 @@ module ActiveFacts
 	  { # A forward-referenced entity type
 	    # REVISIT: A change in this rule might allow forward-referencing a multi-word term
 	    def ast
-	      Compiler::Reference.new(id.text_value, nil, nil, nil, ss.empty? ? nil : ss.value)
+	      Compiler::Reference.new(id.text_value, nil, nil, nil, nil, ss.empty? ? nil : ss.value)
 	    end
 	  }
       end

data/lib/activefacts/cql/Terms.treetop

@@ -18,7 +18,9 @@ module ActiveFacts
         / mapping_pragmas is_where			      # Objectified type
         / non_phrase
 	/ identified_by					      # as in: "a kind of X identified by..."
-	/ unit
+	/ in_units
+	/ auto_assignment
+	/ value_constraint
       end
 
       rule entity_prefix

data/lib/activefacts/cql/ValueTypes.treetop

@@ -16,7 +16,8 @@ module ActiveFacts
 	any? s
         base:(term/implicit_value_type_name) s
         value_type_parameters
-        u:units?
+        u:in_units?
+	a:auto_assignment?
 	c:context_note?
         r:(value_constraint enforcement)?
         m2:mapping_pragmas
@@ -30,14 +31,19 @@ module ActiveFacts
 	    unless r.empty? 
 	      value_constraint = Compiler::ValueConstraint.new(r.value_constraint.ast, r.enforcement.ast)
 	    end
-	    units = u.empty? ? [] : u.value
+	    units = u.empty? ? [] : u.units.value
+	    auto_assigned_at = a.empty? ? nil : a.auto_assigned_at
 	    pragmas = m1.value+m2.value
 	    context_note = !c.empty? ? c.ast : (!c2.empty? ? c2.ast : nil)
-	    Compiler::ValueType.new name, base.value, params, units, value_constraint, pragmas, context_note
+	    Compiler::ValueType.new name, base.value, params, units, value_constraint, pragmas, context_note, auto_assigned_at
 	  end
         }
       end
 
+      rule in_units
+	in S units
+      end
+
       rule implicit_value_type_name
 	id
 	{
@@ -130,7 +136,7 @@ module ActiveFacts
       end
 
       rule non_unit
-        restricted_to / conversion / approximately / ephemera
+        restricted_to / conversion / approximately / ephemera / auto_assignment
       end
 
       rule unit

data/lib/activefacts/cql/compiler.rb

@@ -65,6 +65,7 @@ module ActiveFacts
         # parse_all returns an array of the block's non-nil return values.
         ok = parse_all(@string, :definition) do |node|
           trace :parse, "Parsed '#{node.text_value.gsub(/\s+/,' ').strip}'" do
+	    trace :lex, (proc { node.inspect })
             begin
               ast = node.ast
               next unless ast