activefacts-cql 1.8.1 → 1.8.2

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

@@ -15,12 +15,12 @@ module ActiveFacts
       end
 
       rule auto_assignment
-	'auto-assigned' S at s time:('assert' / 'commit') !alphanumeric s
-	{
-	  def auto_assigned_at
-	    time.text_value
-	  end
-	}
+        '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
@@ -43,148 +43,151 @@ module ActiveFacts
 
       # The pattern to introduce an objectified fact type with implicit identification
       rule is_where
-	is s i:(independent s)? where
-	{ def independent; !i.empty?; end }
+        is s i:(independent s)? where
+        { def independent; !i.empty?; end }
       end
 
-      rule in_which	# Introduce an objectification step
-	where /	    # Old syntax
-	in s which  # preferred syntax
+      rule in_which     # Introduce an objectification step
+        where /     # Old syntax
+        in s which  # preferred syntax
       end
 
       # Units conversion keyword
       rule conversion
-	converts s a:(approximately s)? to s
-	{
-	  def approximate?
-	    !a.empty?
-	  end
-	}
+        converts s a:(approximately s)? to s
+        {
+          def approximate?
+            !a.empty?
+          end
+        }
       end
 
       # >>>>>>>>>>>>>>>>>>>> Constraints <<<<<<<<<<<<<<<<<<<<
       # External presence constraint syntax:
       rule each_occurs_in_clauses
         s 'each' s ('combination' S)? role_list s occurs s quantifier s 'time' 's'? s enforcement 'in' s
-	  clauses_list s c:context_note? ';'
-	{
-	  def role_list_ast
-	    role_list.ast
-	  end
-	  def quantifier_ast
-	    quantifier.ast
-	  end
-	  def clauses_ast
-	    clauses_list.ast
-	  end
-	}
+          clauses_list s c:context_note? ';'
+        {
+          def role_list_ast
+            role_list.ast
+          end
+          def quantifier_ast
+            quantifier.ast
+          end
+          def clauses_ast
+            clauses_list.ast
+          end
+        }
       end
 
       # Alternate external presence constraint syntax:
       rule either_or
       s either? s r1:clauses s or s r2:clauses c:context_note? enforcement ';'
       {
-	  def role_list_ast
-	    nil
-	  end
-	  def quantifier_ast
-	    Compiler::Quantifier.new(1, nil)
-	  end
-	  def clauses_ast
-	    [r1.ast, r2.ast]
-	  end
-	}
+          def role_list_ast
+            nil
+          end
+          def quantifier_ast
+            Compiler::Quantifier.new(1, nil)
+          end
+          def clauses_ast
+            [r1.ast, r2.ast]
+          end
+        }
       end
 
       # Exclusion (at most one) and mandatory exclusion (exactly one) constraint syntax:
       rule for_each_how_many
         s 'for' s 'each' s role_list s quantifier s 'of' s 'these' s 'holds' s enforcement ':' s
-	  clauses_list s c:context_note? ';'
-	{
-	  def role_list_ast
-	    role_list.ast
-	  end
-	  def quantifier_ast
-	    quantifier.ast
-	  end
-	  def clauses_ast
-	    clauses_list.ast
-	  end
-	}
+          clauses_list s c:context_note? ';'
+        {
+          def role_list_ast
+            role_list.ast
+          end
+          def quantifier_ast
+            quantifier.ast
+          end
+          def clauses_ast
+            clauses_list.ast
+          end
+        }
       end
 
       # Alternate mandatory exclusion constraint syntax:
       rule either_or_not_both
         s either? s r1:clauses s or s r2:clauses but s not s both s c:context_note? enforcement ';'
-	{
-	  def role_list_ast
-	    nil
-	  end
-	  def quantifier_ast
-	    Compiler::Quantifier.new(1, 1)
-	  end
-	  def clauses_ast
-	    [r1.ast, r2.ast]
-	  end
-	}
+        {
+          def role_list_ast
+            nil
+          end
+          def quantifier_ast
+            Compiler::Quantifier.new(1, 1)
+          end
+          def clauses_ast
+            [r1.ast, r2.ast]
+          end
+        }
       end
 
       # Subset constraint using "A only if B" syntax
       rule a_only_if_b
-	s clauses:query_clauses s only s if s r2:query_clauses s c:context_note? enforcement ';'
+        s clauses:query_clauses s only s if s r2:query_clauses s c:context_note? enforcement ';'
       end
 
       rule only_if
-	only s if s
+        only s if s
       end
 
       # Subset constraint using "if A then B" syntax
       rule if_b_then_a
-	s if s clauses s then s r2:clauses s c:context_note? enforcement ';'
+        s if s clauses s then s r2:clauses s c:context_note? enforcement ';'
       end
 
       # Equality constraint syntax:
       rule if_and_only_if
         s clauses s tail:( if s and s only s if s clauses s)+
-	  c:context_note? enforcement ';'
+          c:context_note? enforcement ';'
       end
 
       # During the prescan we need to know where terms in a role list finish.
       # This rule matches any non-term expressions that may follow a role list.
       rule role_list_constraint_followers
-	occurs s quantifier s 'time'
+        occurs s quantifier s 'time'
       end
 
       # >>>>>>>>>>>>>>>>>>>> Quantifiers <<<<<<<<<<<<<<<<<<<<
       rule quantifier
-	(
-	  each s                    { def value; [1, 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
-	  / that s                  { def value; nil; end }
-	  / which s                 { def value; nil; end }
-	  / one s                   { def value; [1, 1]; end }
-	  / no s                    { def value; [0, 0]; end }
-	  / exactly s quantity      { def value; q = quantity.value; [q, q]; end }
-	  / at s least s quantity most:( and s at s most s q:quantity )?
-				    { def value;
-					[ quantity.value,
-					  most.empty? ? nil : most.q.value
-					]
-				      end
-				    }
-	  / at s most s quantity    { def value; [ nil, quantity.value ]; end }
-	  / from s numeric_range s  { def value; numeric_range.value; end }
-	# / either_all_or_none s    { def value; [ -1, 1 ]; end }
-	)
-	{
-	  def ast
-	    v = value
-	    Compiler::Quantifier.new(v[0], v[1])
-	  end
-	}
+        quantifier1
+        {
+          def ast
+            v = value
+            Compiler::Quantifier.new(v[0], v[1])
+          end
+        }
+      end
+
+      rule quantifier1
+        (each s                   { def value; [1, 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
+        / (that s                 { def value; nil; end })
+        / (which s                { def value; nil; end })
+        / (one s                  { def value; [1, 1]; end })
+        / (no s                   { def value; [0, 0]; end })
+        / (exactly s quantity     { def value; q = quantity.value; [q, q]; end })
+        / (at s least s quantity most:( and s at s most s q:quantity )?
+                                  { def value;
+                                      [ quantity.value,
+                                        most.empty? ? nil : most.q.value
+                                      ]
+                                    end
+                                  }
+          )
+        / (at s most s quantity   { def value; [ nil, quantity.value ]; end })
+        / (from s numeric_range s { def value; numeric_range.value; end })
+      # / (either_all_or_none s   { def value; [ -1, 1 ]; end })
       end
 
       # rule either_all_or_none either s all s or s ( none / no ) end
@@ -208,9 +211,9 @@ module ActiveFacts
       rule agents
         s h:agent s t:(',' s !context_type agent s)*
         {
-	  def value; [h.text_value] + t.elements.map{|e| e.agent.text_value }; end
-	  def node_type; :linking; end
-	}
+          def value; [h.text_value] + t.elements.map{|e| e.agent.text_value }; end
+          def node_type; :linking; end
+        }
       end
 
       rule agent
@@ -218,11 +221,11 @@ module ActiveFacts
       end
 
       rule negative_prefix
-	s it s is s not s the s case s that s
+        s it s is s not s the s case s that s
       end
 
-      rule agg_of of end 
-      rule agg_in in end 
+      rule agg_of of end
+      rule agg_in in end
       rule restricted_to 'restricted' s 'to' s !alphanumeric end
       # any is optionally used in an identifying role_list
       rule any one / a end
@@ -232,12 +235,12 @@ module ActiveFacts
       rule all 'all' !alphanumeric end
       rule ascending 'ascending' !alphanumeric end
       rule at 'at' !alphanumeric end
-      rule both 'both' !alphanumeric end 
-      rule converts 'converts' !alphanumeric end 
+      rule both 'both' !alphanumeric end
+      rule converts 'converts' !alphanumeric end
       rule descending 'descending' !alphanumeric end
-      rule each 'each' !alphanumeric end 
-      rule either 'either' !alphanumeric end 
-      rule entity 'entity' !alphanumeric end 
+      rule each 'each' !alphanumeric end
+      rule either 'either' !alphanumeric end
+      rule entity 'entity' !alphanumeric end
       rule exactly 'exactly' !alphanumeric end
       rule from  'from' !alphanumeric end
       rule includes 'includes' !alphanumeric end
@@ -254,61 +257,63 @@ module ActiveFacts
       # >>>>>>>>>>>>>>>>>>>> External vocabulary <<<<<<<<<<<<<<<<<<<<
       rule according_to 'according' S to end
       rule acyclic 'acyclic' !alphanumeric end
-      rule alias 'alias' !alphanumeric end 
+      rule alias 'alias' !alphanumeric end
       rule and 'and' !alphanumeric end
       rule antisymmetric 'antisymmetric' !alphanumeric end
       rule approximately 'approximately' !alphanumeric end
       rule as 'as' !alphanumeric end
-      rule as_opposed_to as s 'opposed' S to end 
+      rule as_opposed_to as s 'opposed' S to end
       rule asymmetric 'asymmetric' !alphanumeric end
       rule because 'because' !alphanumeric end
-      rule but 'but' !alphanumeric end 
-      rule by 'by' !alphanumeric end			      # fix? Used in 'returning' for ordering
-      rule case 'case' !alphanumeric end 
+      rule but 'but' !alphanumeric end
+      rule by 'by' !alphanumeric end                          # fix? Used in 'returning' for ordering
+      rule case 'case' !alphanumeric end
       rule definitely 'definitely' !alphanumeric end
-      rule ephemera 'ephemera' !alphanumeric end 
-      rule false 'false' !alphanumeric end 
-      rule feminine 'feminine' !alphanumeric end 
-      rule identified ('known'/'identified') !alphanumeric end 
+      rule ephemera 'ephemera' !alphanumeric end
+      rule false 'false' !alphanumeric end
+      rule feminine 'feminine' !alphanumeric end
+      rule identified ('known'/'identified') !alphanumeric end
       rule if 'if' !alphanumeric end
       rule in 'in' !alphanumeric end
       rule import 'import' !alphanumeric end
-      rule independent 'independent' !alphanumeric end 
+      rule independent 'independent' !alphanumeric end
       rule stronglyintransitive 'strongly' s 'intransitive' !alphanumeric end
+      rule informally [Ii] 'nformally' !alphanumeric end
       rule intransitive 'intransitive' !alphanumeric end
       rule irreflexive 'irreflexive' !alphanumeric end
-      rule is 'is' !alphanumeric end 
+      rule is 'is' !alphanumeric end
       rule it 'it' !alphanumeric end
       rule its 'its' !alphanumeric end
-      rule masculine 'masculine' !alphanumeric end 
+      rule masculine 'masculine' !alphanumeric end
       rule maybe 'maybe' !alphanumeric end
       rule only 'only' !alphanumeric end
-      rule or 'or' !alphanumeric end 
-      rule of 'of' !alphanumeric end 
+      rule or 'or' !alphanumeric end
+      rule of 'of' !alphanumeric end
       rule ordering_prefix by s (ascending/descending)? s end
-      rule otherwise 'otherwise' !alphanumeric end 
-      rule partitioned 'partitioned' !alphanumeric end 
-      rule personal 'personal' !alphanumeric end 
+      rule otherwise 'otherwise' !alphanumeric end
+      rule partitioned 'partitioned' !alphanumeric end
+      rule personal 'personal' !alphanumeric end
       rule radix_point '.' end
       rule reflexive 'reflexive' !alphanumeric end
       rule returning 'returning' !alphanumeric end
-      rule separate 'separate' !alphanumeric end 
+      rule separate 'separate' !alphanumeric end
       rule so_that 'so' S that end
       rule static 'static' !alphanumeric end
       rule symmetric 'symmetric' !alphanumeric end
       rule that 'that' !alphanumeric end
-      rule the 'the' !alphanumeric end 
+      rule the 'the' !alphanumeric end
       rule then 'then' !alphanumeric end
       rule to 'to' !alphanumeric end
       rule to_avoid to s 'avoid' !alphanumeric end
       rule transient 'transient' !alphanumeric end
       rule transitive 'transitive' !alphanumeric end
-      rule true 'true' !alphanumeric end 
-      rule vocabulary 'vocabulary' !alphanumeric end 
-      rule where 'where' !alphanumeric end 
-      rule which 'which' !alphanumeric end 
-      rule was 'was' !alphanumeric end 
-      rule who 'who' !alphanumeric end 
+      rule true 'true' !alphanumeric end
+      rule vocabulary 'vocabulary' !alphanumeric end
+      rule when 'when' !alphanumeric end
+      rule where 'where' !alphanumeric end
+      rule which 'which' !alphanumeric end
+      rule was 'was' !alphanumeric end
+      rule who 'who' !alphanumeric end
 
     end
   end

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

@@ -12,21 +12,21 @@ module ActiveFacts
       # >>>>>>>>>>>>>>>>>>>> Object Types <<<<<<<<<<<<<<<<<<<<
       # The pattern to introduce a Value Type
       rule written_as
-	s est s 'écrit' S 'en' s
+        s est s 'écrit' S 'en' s
       end
 
       rule auto_assignment
-	'auto-assigné' S to time:('assertion' / 'validation') !alphanumeric s
-	{
-	  def auto_assigned_at
-	    time.text_value == 'assertion' ? 'assert' : 'commit'
-	  end
-	}
+        'auto-assigné' S to time:('assertion' / 'validation') !alphanumeric s
+        {
+          def auto_assigned_at
+            time.text_value == 'assertion' ? 'assert' : 'commit'
+          end
+        }
       end
 
       # The pattern to introduce an Entity Type
       rule identified_by
-	'identifié' s 'par' s
+        'identifié' s 'par' s
       end
 
       rule basetype_expression
@@ -44,147 +44,147 @@ module ActiveFacts
 
       # The pattern to introduce an objectified fact type with implicit identification
       rule is_where
-	existe s i:(independent s)? si
-	{ def independent; !i.empty?; end }
+        existe s i:(independent s)? si
+        { def independent; !i.empty?; end }
       end
 
-      rule in_which	# Introduce an objectification step
-	where /	        # Old syntax
-	dans s laquel   # preferred syntax
+      rule in_which     # Introduce an objectification step
+        where /         # Old syntax
+        dans s laquel   # preferred syntax
       end
 
       # Units conversion keyword
       rule conversion
-	converts s a:(approximately s)? to s
-	{
-	  def approximate?
-	    !a.empty?
-	  end
-	}
+        converts s a:(approximately s)? to s
+        {
+          def approximate?
+            !a.empty?
+          end
+        }
       end
 
       # >>>>>>>>>>>>>>>>>>>> Constraints <<<<<<<<<<<<<<<<<<<<
       # External presence constraint syntax:
       rule each_occurs_in_clauses
-	s chaque s ('combinaison' S)? role_list s existe s quantifier 'fois' S
-	  'parmis' S ce S 'qui' S 'suit' s ':' s
-	  clauses_list s c:context_note? ';'
-	{
-	  def role_list_ast
-	    role_list.ast
-	  end
-	  def quantifier_ast
-	    quantifier.ast
-	  end
-	  def clauses_ast
-	    clauses_list.ast
-	  end
-	}
+        s chaque s ('combinaison' S)? role_list s existe s quantifier 'fois' S
+          'parmis' S ce S 'qui' S 'suit' s ':' s
+          clauses_list s c:context_note? ';'
+        {
+          def role_list_ast
+            role_list.ast
+          end
+          def quantifier_ast
+            quantifier.ast
+          end
+          def clauses_ast
+            clauses_list.ast
+          end
+        }
       end
 
       rule either_or
       s soit s r1:clauses s 'ou' S r2:clauses
-	s c:context_note? enforcement ';'
+        s c:context_note? enforcement ';'
       {
-	  def role_list_ast
-	    nil
-	  end
-	  def quantifier_ast
-	    Compiler::Quantifier.new(1, nil)
-	  end
-	  def clauses_ast
-	    [r1.ast, r2.ast]
-	  end
-	}
+          def role_list_ast
+            nil
+          end
+          def quantifier_ast
+            Compiler::Quantifier.new(1, nil)
+          end
+          def clauses_ast
+            [r1.ast, r2.ast]
+          end
+        }
       end
 
       # Used for exclusion (at most one) and mandatory exclusion (exactly one)
       rule for_each_how_many
-	'pour' S 'chaque' S role_list s
-	  quantifier s 'des' S 'suivants' S 's\'applique' s ':' s
-	  clauses_list s c:context_note? ';'
-	{
-	  def role_list_ast
-	    role_list.ast
-	  end
-	  def quantifier_ast
-	    quantifier.ast
-	  end
-	  def clauses_ast
-	    clauses_list.ast
-	  end
-	}
+        'pour' S 'chaque' S role_list s
+          quantifier s 'des' S 'suivants' S 's\'applique' s ':' s
+          clauses_list s c:context_note? ';'
+        {
+          def role_list_ast
+            role_list.ast
+          end
+          def quantifier_ast
+            quantifier.ast
+          end
+          def clauses_ast
+            clauses_list.ast
+          end
+        }
       end
 
       rule either_or_not_both
-	s soit s r1:clauses s 'ou' S r2:clauses 'mais' S 'pas' S 'les' S 'deux'
-	  s c:context_note? enforcement ';'
-	{
-	  def role_list_ast
-	    nil
-	  end
-	  def quantifier_ast
-	    Compiler::Quantifier.new(1, 1)
-	  end
-	  def clauses_ast
-	    [r1.ast, r2.ast]
-	  end
-	}
+        s soit s r1:clauses s 'ou' S r2:clauses 'mais' S 'pas' S 'les' S 'deux'
+          s c:context_note? enforcement ';'
+        {
+          def role_list_ast
+            nil
+          end
+          def quantifier_ast
+            Compiler::Quantifier.new(1, 1)
+          end
+          def clauses_ast
+            [r1.ast, r2.ast]
+          end
+        }
       end
 
       rule a_only_if_b
-	s clauses s only_if r2:clauses s c:context_note? enforcement ';'
+        s clauses s only_if r2:clauses s c:context_note? enforcement ';'
       end
 
       rule only_if
-	que s si s
+        que s si s
       end
 
       rule if_b_then_a
-	s 'si' S clauses s 'puis' S r2:clauses s c:context_note? enforcement ';'
+        s 'si' S clauses s 'puis' S r2:clauses s c:context_note? enforcement ';'
       end
 
       rule if_and_only_if
         s clauses s tail:( 'si' S 'et' S ('seulement'/'uniquement'/'que') S 'si' S clauses s)+
-	  c:context_note? enforcement ';'
+          c:context_note? enforcement ';'
       end
 
       # During the prescan we need to know where terms in a role list finish.
       # This rule matches any non-term expressions that may follow a role list.
       rule role_list_constraint_followers
-	existe
+        existe
       end
 
       # >>>>>>>>>>>>>>>>>>>> Quantifiers <<<<<<<<<<<<<<<<<<<<
       rule quantifier
-	(
-	  ( chaque s					# "each"
-	    { def value; [1, nil]; end }
-	  / un s 'certain' 'e'? ) s			# "some"
-	    { def value; nil; end }
-	  / ce s					# "that"
-	    { def value; nil; end }
-	  / un s					# "one"; masculine or feminine
-	    { def value; [1, 1]; end }
-	  / 'pas' s 'de' s				# REVISIT: Example: "Personne n'a pas de Casier-judiciaire"
-	    { def value; [0, 0]; end }
-	  / exactement s quantity
-	    { def value; q = quantity.value; [q, q]; end }
-	  / au s moins s quantity most:( et s au s plus q:quantity )? # At least (or at most)
-	    { def value; [ quantity.value, most.empty? ? nil : most.q.value ]; end }
-	  / au s plus s quantity			# At most
-	    { def value; [ nil, quantity.value ]; end }
-	  / entre s numeric_range s			# within numeric_range
-	    { def value; numeric_range.value; end }
-	  / soit s tous s soit s aucun			# either all or none
-	    { def value; [ -1, 1 ]; end }
-	)
-	{
-	  def ast
-	    v = value
-	    Compiler::Quantifier.new(v[0], v[1])
-	  end
-	}
+        (
+          ( chaque s                                    # "each"
+            { def value; [1, nil]; end }
+          / un s 'certain' 'e'? ) s                     # "some"
+            { def value; nil; end }
+          / ce s                                        # "that"
+            { def value; nil; end }
+          / un s                                        # "one"; masculine or feminine
+            { def value; [1, 1]; end }
+          / 'pas' s 'de' s                              # REVISIT: Example: "Personne n'a pas de Casier-judiciaire"
+            { def value; [0, 0]; end }
+          / exactement s quantity
+            { def value; q = quantity.value; [q, q]; end }
+          / au s moins s quantity most:( et s au s plus q:quantity )? # At least (or at most)
+            { def value; [ quantity.value, most.empty? ? nil : most.q.value ]; end }
+          / au s plus s quantity                        # At most
+            { def value; [ nil, quantity.value ]; end }
+          / entre s numeric_range s                     # within numeric_range
+            { def value; numeric_range.value; end }
+          / soit s tous s soit s aucun                  # either all or none
+            { def value; [ -1, 1 ]; end }
+        )
+        {
+          def ast
+            v = value
+            Compiler::Quantifier.new(v[0], v[1])
+          end
+        }
       end
 
       rule quantity
@@ -194,7 +194,7 @@ module ActiveFacts
 
       # >>>>>>>>>>>>>>>>>>>> Context Notes <<<<<<<<<<<<<<<<<<<<
       rule as_agreed_by
-	s 'comme' S 'convenu' S d:('le' s date s)? 'par' S agents
+        s 'comme' S 'convenu' S d:('le' s date s)? 'par' S agents
         { def value; [ d.empty? ? nil : d.date.value, agents.value ]; end }
       end
 
@@ -206,9 +206,9 @@ module ActiveFacts
       rule agents
         s h:agent s t:(',' s !context_type agent s)*
         {
-	  def value; [h.text_value] + t.elements.map{|e| e.agent.text_value }; end
-	  def node_type; :linking; end
-	}
+          def value; [h.text_value] + t.elements.map{|e| e.agent.text_value }; end
+          def node_type; :linking; end
+        }
       end
 
       rule agent
@@ -216,7 +216,7 @@ module ActiveFacts
       end
 
       rule negative_prefix
-	s 'ce' S "n'est" s 'pas' s 'le' s 'cas' s 'que'
+        s 'ce' S "n'est" s 'pas' s 'le' s 'cas' s 'que'
       end
 
       rule agg_of de end 
@@ -228,7 +228,7 @@ module ActiveFacts
       rule all 'tous' !alphanumeric end
       rule at 'a' !alphanumeric end
       rule both 'les deux' !alphanumeric end 
-      rule ce ('cette'/'cet'/'ce') !alphanumeric end	# ce is masculine, cette feminine, cet is ce before a noun
+      rule ce ('cette'/'cet'/'ce') !alphanumeric end    # ce is masculine, cette feminine, cet is ce before a noun
       rule chaque 'chaque' !alphanumeric end
       rule converts 'convertit' !alphanumeric end 
       rule de 'de' !alphanumeric end
@@ -241,15 +241,15 @@ module ActiveFacts
       rule est 'est' !alphanumeric end 
       rule exactement 'exactement' !alphanumeric end
       rule existe 'existe' !alphanumeric end
-      rule from 'à partir de' !alphanumeric end		# REVISIT: google translate
+      rule from 'à partir de' !alphanumeric end         # REVISIT: google translate
       rule includes 'comprend' !alphanumeric end
       rule matches 'matches' !alphanumeric end
       rule moins 'moins' !alphanumeric end
       rule none 'aucun' !alphanumeric end
-      rule not 'not' !alphanumeric end			# REVISIT: Used in constraints
+      rule not 'not' !alphanumeric end                  # REVISIT: Used in constraints
       rule plus 'plus' !alphanumeric end
       rule some 'quelques' !alphanumeric end
-      rule un 'un' 'e'? !alphanumeric end	# un is masculine, une is feminine
+      rule un 'un' 'e'? !alphanumeric end       # un is masculine, une is feminine
       rule que 'que' !alphanumeric end
 
       # >>>>>>>>>>>>>>>>>>>> External vocabulary <<<<<<<<<<<<<<<<<<<<
@@ -258,7 +258,7 @@ module ActiveFacts
       rule alias 'alias' !alphanumeric end 
       rule and 'et' !alphanumeric end
       rule antisymmetric 'antisymmetric' !alphanumeric end
-      rule approximately 'environ' !alphanumeric end		# REVISIT: google translate
+      rule approximately 'environ' !alphanumeric end            # REVISIT: google translate
       rule as 'comme' !alphanumeric end
       rule as_opposed_to 'au' S 'lieu' S 'de' !alphanumeric end
       rule asymmetric 'asymétrique' !alphanumeric end
@@ -274,16 +274,16 @@ module ActiveFacts
       rule feminine 'féminin' !alphanumeric end 
       rule identified ('identifié') !alphanumeric end 
       rule if 'si' !alphanumeric end
-      rule import 'import' !alphanumeric end			# REVISIT: translation?
+      rule import 'import' !alphanumeric end                    # REVISIT: translation?
       rule independent 'indépendant' !alphanumeric end
       rule stronglyintransitive 'stronglyintransitif' !alphanumeric end
       rule intransitive 'intransitif' !alphanumeric end
       rule irreflexive 'irréflexive' !alphanumeric end
-      rule is est end			# Called from ObjectTypes.treetop in "is identified by"
+      rule is est end                   # Called from ObjectTypes.treetop in "is identified by"
       rule its ('sa' / 'son') !alphanumeric end
       rule masculine 'masculin' !alphanumeric end 
-      rule maybe 'peut-être' !alphanumeric end			# REVISIT: eventuellement = possibly?
-      rule only 'que' !alphanumeric end			# REVISIT: Used in constraints
+      rule maybe 'peut-être' !alphanumeric end                  # REVISIT: eventuellement = possibly?
+      rule only 'que' !alphanumeric end                 # REVISIT: Used in constraints
       rule or 'ou' !alphanumeric end 
       rule ordering_prefix by s (ascending/descending)? s end
       rule otherwise 'sinon' !alphanumeric end