lib/activefacts/cql/compiler.rb in activefacts-1.0.2 vs lib/activefacts/cql/compiler.rb in activefacts-1.1.0

@@ -27,11 +27,11 @@
       def initialize *a
         @filename = a.shift || "stdio"
         super *a
         @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
         @language = nil
-        debug :file, "Parsing '#{@filename}'"
+        trace :file, "Parsing '#{@filename}'"
       end
 
       def compile_file filename
         old_filename = @filename
         @filename = filename
@@ -62,20 +62,20 @@
         @string = input
 
         # The syntax tree created from each parsed CQL statement gets passed to the block.
         # parse_all returns an array of the block's non-nil return values.
         ok = parse_all(@string, :definition) do |node|
-          debug :parse, "Parsed '#{node.text_value.gsub(/\s+/,' ').strip}'" do
+          trace :parse, "Parsed '#{node.text_value.gsub(/\s+/,' ').strip}'" do
             begin
               ast = node.ast
               next unless ast
-              debug :ast, ast.inspect
+              trace :ast, ast.inspect
               ast.tree = node
               ast.constellation = @constellation
               ast.vocabulary = @vocabulary
               value = compile_definition ast
-              debug :definition, "Compiled to #{value.is_a?(Array) ? value.map{|v| v.verbalise}*', ' : value.verbalise}" if value
+              trace :definition, "Compiled to #{value.is_a?(Array) ? value.map{|v| v.verbalise}*', ' : value.verbalise}" if value
               @vocabulary = value if ast.is_a?(Compiler::Vocabulary)
             rescue => e
               # Augment the exception message, but preserve the backtrace
               start_line = @string.line_of(node.interval.first)
               end_line = @string.line_of(node.interval.last-1)
@@ -120,11 +120,11 @@
         ast.compile
       end
 
       def unit? s
         name = @constellation.Name[s]
-        units = (!name ? [] : Array(name.unit) + Array(name.unit_as_plural_name)).uniq
-        debug :units, "Looking for unit #{s}, got #{units.map{|u|u.name}.inspect}"
+        units = (!name ? [] : Array(name.unit) + Array(name.plural_named_unit)).uniq
+        trace :units, "Looking for unit #{s}, got #{units.map{|u|u.name}.inspect}"
         units.size > 0
       end
 
     end
   end