fabulator 0.0.8 → 0.0.9

data/xsm_expression_parser.racc

@@ -16,6 +16,7 @@ rule
   statement: 
     | expr
     | let_expr
+    | ns_expr { result = nil }
 
   expr: or_expr
     | range_expr
@@ -23,6 +24,9 @@ rule
     | for_expr
     | quant_expr
     | with_expr
+    | err_expr
+
+  err_expr: expr ERR expr { result = Fabulator::Expr::ErrExpr.new(val[0], val[2]) }
 
   with_expr: expr WITH expr_set_list { result = Fabulator::Expr::WithExpr.new(val[0], val[2]) }
 
@@ -41,6 +45,10 @@ rule
 
   let_expr: LET DOLLAR_QNAME COLON_EQUAL expr { result = Fabulator::Expr::LetExpr.new(val[1], val[3]) }
 
+  ns_expr: LET XMLNS_COLON_NCNAME COLON_EQUAL LITERAL { 
+    @context.set_ns(val[1].gsub(/^xmlns:/, ''), val[3])
+  } 
+
   if_expr: IF LP expr RP THEN expr ELSE expr { result = Fabulator::Expr::IfExpr.new(val[2], val[5], val[7]) }
     | IF LP expr RP THEN expr { result = Fabulator::Expr::IfExpr.new(val[2], val[5], nil) }
 
@@ -65,7 +73,7 @@ rule
     | additive_expr EQ additive_expr { result = Fabulator::Expr::EqExpr.new(val[0], val[2]) }
     | additive_expr NEQ additive_expr { result = Fabulator::Expr::NeqExpr.new(val[0], val[2]) }
 
-  tuple: LP LB args RB RP { result = Fabulator::Expr::Tuple.new(val[2]) }
+  tuple: LB args RB { result = Fabulator::Expr::Tuple.new(val[1]) }
 
 #    | LT args GT { result = Fabulator::Expr::Tuple.new(val[1]) }
 
@@ -217,7 +225,7 @@ end
   def parse(text, context)
     @source = text
     @curpos = 0
-    @context = context
+    @context = context.merge
     @line = 0
     @col = 0
 
@@ -248,6 +256,7 @@ end
   @@regex[:axis] = %r{(#{@@regex[:ncname]})\s*(?=::)}
   @@regex[:name_colon_star] = %r{(#{@@regex[:ncname]}:\*)}
   @@regex[:qname] = %r{((?:#{@@regex[:ncname]}:)?#{@@regex[:ncname]})}
+  @@regex[:xmlns] = %r{((?:xmlns:)#{@@regex[:ncname]})}
   @@regex[:dollar_qname] = %r{\$#{@@regex[:qname]}}
   @@regex[:dollar_int] = %r{\$([0-9]+)}
   @@regex[:function_name] = %r{#{@@regex[:qname]}\??\*?\s*(?=\([^:])}
@@ -290,7 +299,7 @@ end
     == & && ||
   }.split(/\s*/), '[', ',', '$' ].each { |t| @@preceding_tokens[t] = true }
 
-  @@regex[:general] = Regexp.compile(%{^(?:#{@@regex[:function_name]}|#{@@regex[:axis]}|#{@@regex[:name_colon_star]}|#{@@regex[:qname]}|#{@@regex[:literal]}|#{@@regex[:number]}|#{@@regex[:dollar_qname]}|#{@@regex[:dollar_int]}|(#{@@regex[:simple_tokens]}))})
+  @@regex[:general] = Regexp.compile(%{^(?:#{@@regex[:xmlns]}|#{@@regex[:function_name]}|#{@@regex[:axis]}|#{@@regex[:name_colon_star]}|#{@@regex[:qname]}|#{@@regex[:literal]}|#{@@regex[:number]}|#{@@regex[:dollar_qname]}|#{@@regex[:dollar_int]}|(#{@@regex[:simple_tokens]}))})
 
   def next_token  
     @token = nil
@@ -393,6 +402,8 @@ end
               @token = [ :MOD, 'mod' ]
             when 'div':
               @token = [ :DIV, 'div' ]
+            when 'err':
+              @token = [ :ERR, 'err' ]
             #when '*doh*':
             #  # do nothing
             #  @token = nil
@@ -420,21 +431,23 @@ end
         raise "Failed to parse '#{@source}' at #{@curpos}': #{@source[@curpos..@source.length-1]}"
       else
         if !res[1].nil?
-          if res[1] == 'if'
+          @token = [ :XMLNS_COLON_NCNAME, res[1] ]
+        elsif !res[2].nil?
+          if res[2] == 'if'
             @token = [ :IF, 'if' ]
           else
-            if @source[@curpos+res[1].length .. @curpos+res[1].length + 1] =~ /^(\??\*?)/
-              @token = [ :FUNCTION_NAME, res[1]+$1 ]
+            if @source[@curpos+res[2].length .. @curpos+res[2].length + 1] =~ /^(\??\*?)/
+              @token = [ :FUNCTION_NAME, res[2]+$1 ]
             else
-              @token = [ :FUNCTION_NAME, res[1] ]
+              @token = [ :FUNCTION_NAME, res[2] ]
             end
           end
-        elsif !res[2].nil?
-          @token = [ res[2] == 'method' ? :AXIS_METHOD : :AXIS_NAME, res[2] ]
         elsif !res[3].nil?
-          @token = [ :NAME_COLON_STAR, res[3] ]
+          @token = [ res[3] == 'method' ? :AXIS_METHOD : :AXIS_NAME, res[3] ]
         elsif !res[4].nil?
-          qname = res[4]
+          @token = [ :NAME_COLON_STAR, res[4] ]
+        elsif !res[5].nil?
+          qname = res[5]
           case qname
             when 'for':
               @token = [ :FOR, 'for' ]
@@ -460,11 +473,13 @@ end
               @token = [ :ELSE, 'else' ]
             when 'with':
               @token = [ :WITH, 'with' ]
+            when 'err':
+              @token = [ :ERR, 'err' ]
             else
-              @token = [ :QNAME, res[4] ]
+              @token = [ :QNAME, qname ]
           end
-        elsif !res[5].nil?
-          s = res[5]
+        elsif !res[6].nil?
+          s = res[6]
           s = s[1..s.length-2]
           @curpos = @curpos + s.length
           @col = @col + s.length
@@ -474,18 +489,18 @@ end
           @token = [ :LITERAL, s ]
           @curpos = @curpos + 2  # the quotes
           @col = @col + 2
-        elsif !res[6].nil?
-          @token = [ :NUMBER, res[6] ]
         elsif !res[7].nil?
-          @curpos = @curpos + 1
-          @col = @col + 1
-          @token = [ :DOLLAR_QNAME, res[7] ]
+          @token = [ :NUMBER, res[7] ]
         elsif !res[8].nil?
           @curpos = @curpos + 1
           @col = @col + 1
           @token = [ :DOLLAR_QNAME, res[8] ]
         elsif !res[9].nil?
-          @token = [ @@ops[res[9]] || res[9], res[9] ]
+          @curpos = @curpos + 1
+          @col = @col + 1
+          @token = [ :DOLLAR_QNAME, res[9] ]
+        elsif !res[10].nil?
+          @token = [ @@ops[res[10]] || res[10], res[10] ]
         else
           raise "Failed to parse '#{@source}' at #{@curpos}: #{@source[@curpos..@source.length-1]}"
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +00:00
+date: 2010-10-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,19 +130,20 @@ files:
 - init.rb
 - lib/fabulator.rb
 - lib/fabulator/action.rb
-- lib/fabulator/context.rb
+- lib/fabulator/compiler.rb
 - lib/fabulator/core.rb
-- lib/fabulator/core/actions.rb
 - lib/fabulator/core/actions/choose.rb
 - lib/fabulator/core/actions/for_each.rb
 - lib/fabulator/core/actions/variables.rb
-- lib/fabulator/core/constraint.rb
-- lib/fabulator/core/filter.rb
-- lib/fabulator/core/group.rb
-- lib/fabulator/core/parameter.rb
-- lib/fabulator/core/state.rb
-- lib/fabulator/core/state_machine.rb
-- lib/fabulator/core/transition.rb
+- lib/fabulator/core/lib.rb
+- lib/fabulator/core/structurals.rb
+- lib/fabulator/core/structurals/constraint.rb
+- lib/fabulator/core/structurals/filter.rb
+- lib/fabulator/core/structurals/group.rb
+- lib/fabulator/core/structurals/parameter.rb
+- lib/fabulator/core/structurals/state.rb
+- lib/fabulator/core/structurals/state_machine.rb
+- lib/fabulator/core/structurals/transition.rb
 - lib/fabulator/expr.rb
 - lib/fabulator/expr/axis.rb
 - lib/fabulator/expr/axis_descendent_or_self.rb
@@ -171,6 +172,9 @@ files:
 - lib/fabulator/lib/structural.rb
 - lib/fabulator/structural.rb
 - lib/fabulator/tag_lib.rb
+- lib/fabulator/tag_lib/presentations.rb
+- lib/fabulator/tag_lib/transformations.rb
+- lib/fabulator/tag_lib/type.rb
 - lib/fabulator/template.rb
 - lib/fabulator/template/context.rb
 - lib/fabulator/template/parse_result.rb

data/lib/fabulator/context.rb

@@ -1,39 +0,0 @@
-module Fabulator
-  class Context
-    attr_accessor :data, :state
-
-    def initialize
-      @state = 'start'
-      @data = nil
-    end
-
-    def empty?
-      @state = 'start' if @state.nil?
-      (@data.nil? || @data.empty?) && @state == 'start'
-    end
-
-    def merge!(d, path=nil)
-      return if @data.nil?
-      return @data.merge_data(d,path)
-    end
-
-    def clear(path = nil)
-      return if @data.nil?
-      return @data.clear(path)
-    end
-
-    def context
-      { :state => @state, :data => @data }
-    end
-
-    def context=(c)
-      @state = c[:state]
-      @data  = c[:data]
-    end
-
-    def get(p = nil)
-      return if @data.nil?
-      return @data.get(p)
-    end
-  end
-end