rdl 2.1.0 → 2.2.0

data/lib/rdl/types/intersection.rb

@@ -69,6 +69,14 @@ module RDL::Type
       return IntersectionType.new(*(@types.map { |t| t.instantiate(inst) }))
     end
 
+    def widen
+      return IntersectionType.new(*(@types.map { |t| t.widen }))
+    end
+
+    def copy
+      return IntersectionType.new(*(@types.map { |t| t.copy }))
+    end
+
     def hash  # :nodoc:
       return 47 + @types.hash
     end

data/lib/rdl/types/lexer.rex

@@ -2,12 +2,13 @@ module RDL::Type
 class Parser
 
 macro
-  ID (\w|\:\:)+
+  ID ((\w|\:\:)+(!|\?|=)?)|~|\+|-|\/|&|\||\^
   SYMBOL :\w+
   SPECIAL_ID %\w+
   FIXNUM -?(\d)+
   FLOAT -?\d\.\d+
   PREDICATE \{\{(?:(?!}}).)+\}\}
+  COMP  ``(?:(?!``).)+``
 
 
 rule
@@ -21,11 +22,14 @@ rule
   \}            { [:RBRACE, text] }
   \[            { [:LBRACKET, text] }
   \]            { [:RBRACKET, text] }
+  <\:\:		{ [:BIND, text] }
   <             { [:LESS, text] }
   >             { [:GREATER, text] }
+  =             { [:EQUAL, text] }
   ,             { [:COMMA, text] }
   \?            { [:QUERY, text] }
   \!            { [:BANG, text] }
+  ~             { [:TILDE, text] }
   \*\*          { [:STARSTAR, text] }
   \*            { [:STAR, text] }
   \#T           { [:HASH_TYPE, text] }
@@ -33,6 +37,7 @@ rule
   \$\{          { [:CONST_BEGIN, text] }
   \.\.\.        { [:DOTS, text] }
   \.            { [:DOT, text] }
+  {COMP}	{ [:COMP, text[2..-3]] }
   {FLOAT}       { [:FLOAT, text] } # Must go before FIXNUM
   {FIXNUM}      { [:FIXNUM, text] }
   {ID}          { if text == "or" then [:OR, text] else [:ID, text] end }

data/lib/rdl/types/lexer.rex.rb

@@ -88,12 +88,18 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\]/))
          action { [:RBRACKET, text] }
 
+      when (text = @ss.scan(/<\:\:/))
+         action { [:BIND, text] }
+
       when (text = @ss.scan(/</))
          action { [:LESS, text] }
 
       when (text = @ss.scan(/>/))
          action { [:GREATER, text] }
 
+      when (text = @ss.scan(/=/))
+         action { [:EQUAL, text] }
+
       when (text = @ss.scan(/,/))
          action { [:COMMA, text] }
 
@@ -103,6 +109,9 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\!/))
          action { [:BANG, text] }
 
+      when (text = @ss.scan(/~/))
+         action { [:TILDE, text] }
+
       when (text = @ss.scan(/\*\*/))
          action { [:STARSTAR, text] }
 
@@ -124,13 +133,16 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\./))
          action { [:DOT, text] }
 
+      when (text = @ss.scan(/``(?:(?!``).)+``/))
+         action { [:COMP, text[2..-3]] }
+
       when (text = @ss.scan(/-?\d\.\d+/))
          action { [:FLOAT, text] } # Must go before FIXNUM
 
       when (text = @ss.scan(/-?(\d)+/))
          action { [:FIXNUM, text] }
 
-      when (text = @ss.scan(/(\w|\:\:)+/))
+      when (text = @ss.scan(/((\w|\:\:)+(!|\?|=)?)|~|\+|-|\/|&|\||\^/))
          action { if text == "or" then [:OR, text] else [:ID, text] end }
 
       when (text = @ss.scan(/:\w+/))

data/lib/rdl/types/method.rb

@@ -83,6 +83,8 @@ module RDL::Type
 	        t = t.type
         end
         case t
+        when ComputedType
+          raise "We do not currently support dynamic checks of unevaulated ComputedTypes."
         when OptionalType
           t = t.type.instantiate(inst)
           if actual == args.size
@@ -294,6 +296,18 @@ RUBY
                             @ret.instantiate(inst))
     end
 
+    def widen
+      return MethodType.new(@args.map { |arg| arg.widen },
+                            @block ? @block.widen : nil,
+                            @ret.widen)
+    end
+
+    def copy
+      return MethodType.new(@args.map { |arg| arg.copy },
+                            @block ? @block.copy : nil,
+                            @ret.copy)
+    end
+
     # Return +true+ if +other+ is the same type
     def ==(other)
       return (other.instance_of? MethodType) &&

data/lib/rdl/types/nominal.rb

@@ -72,6 +72,14 @@ module RDL::Type
       return self
     end
 
+    def widen
+      return self
+    end
+
+    def copy
+      return self
+    end
+    
     @@cache.merge!({"NilClass" => SingletonType.new(nil),
                     "TrueClass" => SingletonType.new(true),
                     "FalseClass" => SingletonType.new(false),

data/lib/rdl/types/non_null.rb

@@ -46,5 +46,13 @@ module RDL::Type
     def instantiate(inst)
       return NonNullType.new(@type.instantiate(inst))
     end
+
+    def widen
+      return NonNullType.new(@type.widen)
+    end
+
+    def copy
+      NonNullType.new(@type.copy)
+    end
   end
 end

data/lib/rdl/types/optional.rb

@@ -42,6 +42,14 @@ module RDL::Type
       return OptionalType.new(@type.instantiate(inst))
     end
 
+    def widen
+      return OptionalType.new(@type.widen)
+    end
+
+    def copy
+      return OptionalType.new(@type.copy)
+    end
+
     def hash # :nodoc:
       return 57 + @type.hash
     end

data/lib/rdl/types/parser.racc

@@ -9,8 +9,8 @@ class Parser
 
 token HASH_TYPE HASH_QUERY CONST_BEGIN RASSOC
 token OR FIXNUM FLOAT COLON RARROW DOT DOTS ID SYMBOL SPECIAL_ID STRING PREDICATE
-token LPAREN RPAREN LBRACE RBRACE LBRACKET RBRACKET
-token COMMA QUERY BANG STARSTAR STAR LESS GREATER
+token LPAREN RPAREN LBRACE RBRACE LBRACKET RBRACKET COMP
+token COMMA QUERY BANG STARSTAR STAR LESS GREATER EQUAL TILDE BIND
 token EOF
 
 rule
@@ -36,10 +36,33 @@ rule
    | LPAREN arg_list RPAREN block RARROW type_expr ID PREDICATE {
         result = RDL::Type::MethodType.new val[1], val[3], RDL::Type::DependentArgType.new(val[6], val[5], val[7])
       }
+   | LPAREN arg_list RPAREN block RARROW COMP {
+     	result = RDL::Type::MethodType.new(val[1], val[3], RDL::Type::ComputedType.new(val[5]))
+      }
 
   method_sig_list:
-     ID COLON method_type { result = [val[0].to_sym, val[2]] }
-   | ID COLON method_type COMMA method_sig_list { result = [val[0].to_sym, val[2]] + val[4] }
+     method_name COLON method_type { result = [val[0], val[2]] }
+   | method_name COLON method_type COMMA method_sig_list { result = [val[0], val[2]] + val[4] }
+
+  method_name:
+     ID { result = val[0].to_sym }
+   | BANG { result = :! }
+   | STAR { result = :* }
+   | STARSTAR { result = :** }
+   | LESS { result = :< }
+   | LESS EQUAL { result = :<= }
+   | GREATER { result = :> }
+   | GREATER EQUAL { result = :>= }
+   | EQUAL EQUAL  { result = :== }
+   | BANG EQUAL { result = :!= }
+   | EQUAL EQUAL EQUAL { result = :=== }
+   | LESS EQUAL GREATER { result = :<=> }
+   | LESS LESS { result = :<< }
+   | GREATER GREATER { result = :>> }
+   | LBRACKET RBRACKET { result = :[] }
+   | LBRACKET RBRACKET EQUAL { result = :[]= }
+   | EQUAL TILDE { result = :=~ }
+   | BANG TILDE { result = :!~ }
 
   arg_list:
       { result = [] }
@@ -57,6 +80,9 @@ rule
       base_arg { result = val[0] }
     | base_arg ID PREDICATE { result = RDL::Type::DependentArgType.new(val[1], val[0], val[2]) }
     | base_arg ID { result = RDL::Type::AnnotatedArgType.new(val[1], val[0]) }
+    | ID BIND base_arg { result = RDL::Type::BoundArgType.new(val[0], val[2]) }
+    | ID BIND COMP { result = RDL::Type::BoundArgType.new(val[0], RDL::Type::ComputedType.new(val[2])) }
+    | COMP { result = RDL::Type::ComputedType.new(val[0]) }
     | DOTS { result = RDL::Type::DotsQuery.new }
   named_arg_list:
       named_arg { result = [val[0], nil] }
@@ -150,7 +176,7 @@ rule
       result =  RDL::Type::SingletonType.new(Kernel.const_get(val[1]))
     }
 # The following can't be used in SingletonTypes because those compare using .equal?
-#    | STRING { result = RDL::Type::SingletonType.new(val[0]) }
+    | STRING { result = RDL::Type::PreciseStringType.new(val[0]) }
     | DOT { result = RDL::Type::WildQuery.new }
 
 ---- header ----

data/lib/rdl/types/parser.tab.rb

@@ -11,7 +11,7 @@ module RDL::Type
 
 class Parser < Racc::Parser
 
-module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 161)
+module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 187)
 
 def initialize()
   @yydebug = true
@@ -21,213 +21,280 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    38,    68,    21,   101,    19,    20,    41,    22,    29,    32,
-    14,    16,     7,    83,    11,   103,    17,    84,    18,    31,
-    33,    13,    31,    34,   105,    39,    39,    21,   106,    19,
-    20,   108,    22,    29,    32,    14,    16,     7,   111,    11,
-   113,    17,   114,    18,    77,    33,    13,    31,    34,    45,
-   115,    43,    44,     5,     6,    45,    41,    43,    44,    46,
-     8,     7,    41,     7,    36,    46,    56,     7,    57,    48,
-    58,    21,    59,    19,    20,    48,    22,    60,    15,    14,
-    16,    62,    65,    11,    62,    17,    21,    18,    19,    20,
-    13,    22,    69,    15,    14,    16,    70,    71,    72,    73,
-    17,    21,    18,    19,    20,    13,    22,    75,    15,    14,
-    16,    76,    77,    11,    78,    17,    21,    18,    19,    20,
-    13,    22,    79,    15,    14,    16,    80,    81,    11,    87,
-    17,    21,    18,    19,    20,    13,    22,    92,    15,    14,
-    16,    96,     7,    11,   nil,    17,    21,    18,    19,    20,
-    13,    22,   nil,    15,    14,    16,   nil,   nil,    11,   nil,
-    17,    21,    18,    19,    20,    13,    22,   nil,    15,    14,
-    16,   nil,   nil,    11,   nil,    17,   nil,    18,   nil,    90,
-    13,    21,   nil,    19,    20,   nil,    22,   nil,    15,    14,
-    16,   nil,   nil,    11,   nil,    17,    21,    18,    19,    20,
-    13,    22,   nil,    15,    14,    16,   nil,   nil,   nil,   nil,
-    17,    21,    18,    19,    20,    13,    22,   nil,    15,    14,
-    16,   nil,   nil,   nil,   nil,    17,    21,    18,    19,    20,
-    13,    22,   nil,    15,    14,    16,   nil,   nil,   nil,   nil,
-    17,    21,    18,    19,    20,    13,    22,   nil,    51,    14,
-    16,   nil,   nil,    11,   nil,    17,   nil,    18,    55,    21,
-    13,    19,    20,   nil,    22,   nil,    15,    14,    16,   nil,
-   nil,   nil,   nil,    17,    21,    18,    19,    20,    13,    22,
-   nil,    15,    14,    16,   nil,   nil,   nil,   nil,    17,    21,
-    18,    19,    20,    13,    22,   nil,    15,    14,    16,   nil,
-   nil,    11,   nil,    17,    21,    18,    19,    20,    13,    22,
-   nil,    15,    14,    16,   nil,   nil,    11,   nil,    17,    21,
-    18,    19,    20,    13,    22,   nil,    15,    14,    16,   nil,
-   nil,    11,   nil,    17,    21,    18,    19,    20,    13,    22,
-   nil,    15,    14,    16,   nil,   nil,    11,   nil,    17,    21,
-    18,    19,    20,    13,    22,   nil,    15,    14,    16,   nil,
+    40,    79,    71,    21,    43,    19,    20,    99,    23,   103,
+    15,    14,    16,    22,   104,   -26,   100,    17,    34,    18,
+     5,     6,    92,   101,    91,    70,    41,    41,    89,    90,
+    21,   107,    19,    20,     7,    23,   124,    54,    14,    16,
+    22,    38,    11,     7,    17,   114,    61,    97,    95,    96,
+    55,    57,    56,    58,    59,    60,    21,   124,    19,    20,
+   141,    23,   118,    54,    14,    16,    22,   142,    11,     7,
+    17,     7,    61,    65,    94,    93,    55,    57,    56,    58,
+    59,    60,    21,   122,    19,    20,   123,    23,     8,    15,
+    14,    16,    22,   126,    11,     7,    17,   128,    18,    69,
+   109,    35,    13,    21,    36,    19,    20,    72,    23,    32,
+    30,    14,    16,    22,   143,    11,   130,    17,    76,    18,
+   131,    31,    35,    13,    34,    36,    21,   144,    19,    20,
+    68,    23,    32,    30,    14,    16,    22,    71,    11,    80,
+    17,    81,    18,    82,    31,    35,    13,    34,    36,    47,
+    84,    45,    46,    89,    90,    47,    43,    45,    46,    48,
+    83,   134,    43,    86,    87,    48,    88,     7,   -12,    67,
+    50,    66,    21,    98,    19,    20,    50,    23,   nil,    15,
+    14,    16,    22,   nil,    11,   nil,    17,   nil,    18,   nil,
+   nil,    21,    13,    19,    20,   nil,    23,   nil,    15,    14,
+    16,    22,   nil,    11,   nil,    17,   nil,    18,   nil,   nil,
+    21,    13,    19,    20,   nil,    23,   nil,    15,    14,    16,
+    22,   nil,    11,   nil,    17,   nil,    18,   nil,   nil,    21,
+    13,    19,    20,   nil,    23,   nil,    15,    14,    16,    22,
+   nil,    11,   nil,    17,   nil,    18,   nil,   nil,    21,    13,
+    19,    20,   nil,    23,   nil,    15,    14,    16,    22,   nil,
+    11,   nil,    17,   nil,    18,   nil,   nil,    21,    13,    19,
+    20,   nil,    23,   nil,    15,    14,    16,    22,   nil,   nil,
+   nil,    17,   nil,    18,   nil,   nil,    21,    13,    19,    20,
+   nil,    23,   nil,    15,    14,    16,    22,   nil,    11,   nil,
+    17,   nil,    18,   nil,   nil,    21,    13,    19,    20,   nil,
+    23,   nil,    15,    14,    16,    22,   nil,    11,   nil,    17,
+   nil,    18,   nil,   nil,    21,    13,    19,    20,   nil,    23,
+   nil,    15,    14,    16,    22,   nil,    11,   nil,    17,   nil,
+    18,   nil,   nil,   111,    13,    21,   nil,    19,    20,   nil,
+    23,   nil,    15,    14,    16,    22,   nil,   nil,   nil,    17,
+   nil,    18,   nil,   nil,    21,    13,    19,    20,   nil,    23,
+   nil,    15,    14,    16,    22,   nil,   nil,   nil,    17,   nil,
+    18,   nil,   nil,    21,    13,    19,    20,   nil,    23,   nil,
+    15,    14,    16,    22,   nil,   nil,   nil,    17,   nil,    18,
+   nil,   nil,    21,    13,    19,    20,   nil,    23,   nil,    15,
+    14,    16,    22,   nil,   nil,   nil,    17,   nil,    18,   nil,
+   nil,    21,    13,    19,    20,   nil,    23,   nil,    15,    14,
+    16,    22,   nil,    11,   nil,    17,   nil,    18,   nil,   nil,
+    21,    13,    19,    20,   nil,    23,   nil,    15,    14,    16,
+    22,   nil,    11,   nil,    17,   nil,    18,   nil,   nil,    21,
+    13,    19,    20,   nil,    23,   nil,    15,    14,    16,    22,
+   nil,    11,   nil,    17,   nil,    18,   nil,   133,    21,    13,
+    19,    20,   nil,    23,   nil,    15,    14,    16,    22,   nil,
+   138,   nil,    17,   nil,    18,   nil,   nil,   nil,    13,   140,
+   nil,   nil,   nil,   139,    57,    56,    58,    59,    60,    21,
+   nil,    19,    20,   nil,    23,   nil,    15,    14,    16,    22,
    nil,   nil,   nil,    17,   nil,    18 ]
 
 racc_action_check = [
-    12,    40,    58,    82,    58,    58,    60,    58,    58,    58,
-    58,    58,    83,    57,    58,    84,    58,    57,    58,    60,
-    58,    58,    58,    58,    96,    12,    40,     7,    99,     7,
-     7,   102,     7,     7,     7,     7,     7,   103,   106,     7,
-   107,     7,   109,     7,   111,     7,     7,     7,     7,    17,
-   113,    17,    17,     0,     0,    73,    17,    73,    73,    17,
-     1,    17,    73,     6,     8,    73,    21,     0,    24,    17,
-    27,    11,    28,    11,    11,    73,    11,    30,    11,    11,
-    11,    32,    37,    11,    41,    11,    72,    11,    72,    72,
-    11,    72,    43,    72,    72,    72,    44,    45,    46,    47,
-    72,    78,    72,    78,    78,    72,    78,    49,    78,    78,
-    78,    50,    51,    78,    52,    78,    48,    78,    48,    48,
-    78,    48,    53,    48,    48,    48,    54,    56,    48,    59,
-    48,    90,    48,    90,    90,    48,    90,    67,    90,    90,
-    90,    71,    77,    90,   nil,    90,    31,    90,    31,    31,
-    90,    31,   nil,    31,    31,    31,   nil,   nil,    31,   nil,
-    31,    62,    31,    62,    62,    31,    62,   nil,    62,    62,
-    62,   nil,   nil,    62,   nil,    62,   nil,    62,   nil,    62,
-    62,     5,   nil,     5,     5,   nil,     5,   nil,     5,     5,
-     5,   nil,   nil,     5,   nil,     5,    68,     5,    68,    68,
-     5,    68,   nil,    68,    68,    68,   nil,   nil,   nil,   nil,
-    68,    69,    68,    69,    69,    68,    69,   nil,    69,    69,
-    69,   nil,   nil,   nil,   nil,    69,    70,    69,    70,    70,
-    69,    70,   nil,    70,    70,    70,   nil,   nil,   nil,   nil,
-    70,    18,    70,    18,    18,    70,    18,   nil,    18,    18,
-    18,   nil,   nil,    18,   nil,    18,   nil,    18,    18,   105,
-    18,   105,   105,   nil,   105,   nil,   105,   105,   105,   nil,
-   nil,   nil,   nil,   105,    38,   105,    38,    38,   105,    38,
-   nil,    38,    38,    38,   nil,   nil,   nil,   nil,    38,    39,
-    38,    39,    39,    38,    39,   nil,    39,    39,    39,   nil,
-   nil,    39,   nil,    39,    33,    39,    33,    33,    39,    33,
-   nil,    33,    33,    33,   nil,   nil,    33,   nil,    33,   101,
-    33,   101,   101,    33,   101,   nil,   101,   101,   101,   nil,
-   nil,   101,   nil,   101,    34,   101,    34,    34,   101,    34,
-   nil,    34,    34,    34,   nil,   nil,    34,   nil,    34,    13,
-    34,    13,    13,    34,    13,   nil,    13,    13,    13,   nil,
+    12,    42,    30,    55,    72,    55,    55,    63,    55,    67,
+    55,    55,    55,    55,    67,    97,    64,    55,    72,    55,
+     0,     0,    58,    66,    58,    30,    12,    42,    55,    55,
+    61,    69,    61,    61,     0,    61,    97,    61,    61,    61,
+    61,     8,    61,   128,    61,    78,    61,    61,    60,    60,
+    61,    61,    61,    61,    61,    61,    18,   143,    18,    18,
+   132,    18,    82,    18,    18,    18,    18,   135,    18,     6,
+    18,    88,    18,    18,    59,    59,    18,    18,    18,    18,
+    18,    18,    70,    91,    70,    70,    95,    70,     1,    70,
+    70,    70,    70,   102,    70,   103,    70,   104,    70,    29,
+    70,    70,    70,    68,    70,    68,    68,    33,    68,    68,
+    68,    68,    68,    68,   140,    68,   118,    68,    39,    68,
+   121,    68,    68,    68,    68,    68,     7,   141,     7,     7,
+    28,     7,     7,     7,     7,     7,     7,    43,     7,    45,
+     7,    46,     7,    47,     7,     7,     7,     7,     7,    84,
+    49,    84,    84,   139,   139,    17,    84,    17,    17,    84,
+    48,   127,    17,    51,    52,    17,    53,    17,    54,    25,
+    84,    21,    35,    62,    35,    35,    17,    35,   nil,    35,
+    35,    35,    35,   nil,    35,   nil,    35,   nil,    35,   nil,
+   nil,     5,    35,     5,     5,   nil,     5,   nil,     5,     5,
+     5,     5,   nil,     5,   nil,     5,   nil,     5,   nil,   nil,
+    11,     5,    11,    11,   nil,    11,   nil,    11,    11,    11,
+    11,   nil,    11,   nil,    11,   nil,    11,   nil,   nil,    34,
+    11,    34,    34,   nil,    34,   nil,    34,    34,    34,    34,
+   nil,    34,   nil,    34,   nil,    34,   nil,   nil,    36,    34,
+    36,    36,   nil,    36,   nil,    36,    36,    36,    36,   nil,
+    36,   nil,    36,   nil,    36,   nil,   nil,    40,    36,    40,
+    40,   nil,    40,   nil,    40,    40,    40,    40,   nil,   nil,
+   nil,    40,   nil,    40,   nil,   nil,    41,    40,    41,    41,
+   nil,    41,   nil,    41,    41,    41,    41,   nil,    41,   nil,
+    41,   nil,    41,   nil,   nil,    50,    41,    50,    50,   nil,
+    50,   nil,    50,    50,    50,    50,   nil,    50,   nil,    50,
+   nil,    50,   nil,   nil,    71,    50,    71,    71,   nil,    71,
+   nil,    71,    71,    71,    71,   nil,    71,   nil,    71,   nil,
+    71,   nil,   nil,    71,    71,    79,   nil,    79,    79,   nil,
+    79,   nil,    79,    79,    79,    79,   nil,   nil,   nil,    79,
+   nil,    79,   nil,   nil,    80,    79,    80,    80,   nil,    80,
+   nil,    80,    80,    80,    80,   nil,   nil,   nil,    80,   nil,
+    80,   nil,   nil,    81,    80,    81,    81,   nil,    81,   nil,
+    81,    81,    81,    81,   nil,   nil,   nil,    81,   nil,    81,
+   nil,   nil,    83,    81,    83,    83,   nil,    83,   nil,    83,
+    83,    83,    83,   nil,   nil,   nil,    83,   nil,    83,   nil,
+   nil,    98,    83,    98,    98,   nil,    98,   nil,    98,    98,
+    98,    98,   nil,    98,   nil,    98,   nil,    98,   nil,   nil,
+   111,    98,   111,   111,   nil,   111,   nil,   111,   111,   111,
+   111,   nil,   111,   nil,   111,   nil,   111,   nil,   nil,   126,
+   111,   126,   126,   nil,   126,   nil,   126,   126,   126,   126,
+   nil,   126,   nil,   126,   nil,   126,   nil,   126,   130,   126,
+   130,   130,   nil,   130,   nil,   130,   130,   130,   130,   nil,
+   131,   nil,   130,   nil,   130,   nil,   nil,   nil,   130,   131,
+   nil,   nil,   nil,   131,   131,   131,   131,   131,   131,    13,
+   nil,    13,    13,   nil,    13,   nil,    13,    13,    13,    13,
    nil,   nil,   nil,    13,   nil,    13 ]
 
 racc_action_pointer = [
-    48,    60,   nil,   nil,   nil,   174,    44,    20,    64,   nil,
-   nil,    64,    -4,   342,   nil,   nil,   nil,    42,   234,   nil,
-   nil,    52,   nil,   nil,    48,   nil,   nil,    68,    58,   nil,
-    75,   139,    70,   297,   327,   nil,   nil,    62,   267,   282,
-    -3,    73,   nil,    84,    88,    83,    90,    97,   109,    85,
-    89,   101,   112,    98,   102,   nil,   105,    -8,    -5,   111,
-    -8,   nil,   154,   nil,   nil,   nil,   nil,   107,   189,   204,
-   219,   119,    79,    48,   nil,   nil,   nil,   123,    94,   nil,
-   nil,   nil,     0,    -7,    -6,   nil,   nil,   nil,   nil,   nil,
-   124,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,    26,
-   nil,   312,     9,    18,   nil,   252,    24,    26,   nil,    20,
-   nil,    33,   nil,    32,   nil,   nil ]
+    15,    88,   nil,   nil,   nil,   184,    50,   119,    41,   nil,
+   nil,   203,    -4,   502,   nil,   nil,   nil,   148,    49,   nil,
+   nil,   157,   nil,   nil,   nil,   149,   nil,   nil,   128,    85,
+    -9,   nil,   nil,   105,   222,   165,   241,   nil,   nil,    98,
+   260,   279,    -3,   126,   nil,   131,   133,   129,   152,   148,
+   298,   141,   142,   155,   157,    -4,   nil,   nil,    -8,    43,
+    16,    23,   171,   -17,    -8,   nil,     1,   -12,    96,    13,
+    75,   317,   -10,   nil,   nil,   nil,   nil,   nil,    14,   338,
+   357,   376,    40,   395,   142,   nil,   nil,   nil,    52,   nil,
+   nil,    52,   nil,   nil,   nil,    54,   nil,     4,   414,   nil,
+   nil,   nil,    90,    76,    76,   nil,   nil,   nil,   nil,   nil,
+   nil,   433,   nil,   nil,   nil,   nil,   nil,   nil,   108,   nil,
+   nil,   118,   nil,   nil,   nil,   nil,   452,   139,    24,   nil,
+   471,   476,    46,   nil,   nil,    45,   nil,   nil,   nil,   121,
+    90,   109,   nil,    25,   nil ]
 
 racc_action_default = [
-   -63,   -63,    -1,    -2,    -3,   -63,   -63,   -11,   -63,    -4,
-   -33,   -63,   -46,   -63,   -50,   -51,   -52,   -37,   -63,   -59,
-   -60,   -63,   -62,    -5,   -63,   -12,   -13,   -14,   -17,   -20,
-   -21,   -63,   -51,   -63,   -63,   -27,   116,   -63,   -63,   -63,
-   -48,   -63,   -38,   -63,   -63,   -63,   -63,   -43,   -63,   -63,
-   -63,   -51,   -35,   -63,   -63,   -57,   -63,   -30,   -63,   -19,
-   -63,   -22,   -63,   -25,   -26,   -34,   -47,   -63,   -63,   -63,
-   -63,   -63,   -63,   -37,   -44,   -54,   -58,   -63,   -63,   -55,
-   -56,   -61,   -63,   -63,   -63,   -15,   -16,   -18,   -23,   -24,
-   -63,   -29,   -53,   -49,   -39,   -40,   -63,   -42,   -45,    -9,
-   -36,   -63,   -63,   -63,   -28,   -63,   -63,    -6,   -31,   -63,
-   -41,   -63,   -10,    -7,   -32,    -8 ]
+   -86,   -86,    -1,    -2,    -3,   -86,   -86,   -30,   -86,    -4,
+   -55,   -86,   -68,   -86,   -72,   -73,   -74,   -59,   -86,   -81,
+   -82,   -86,   -84,   -85,    -5,   -86,   -31,   -32,   -33,   -36,
+   -73,   -41,   -42,   -43,   -86,   -86,   -86,   -49,   145,   -86,
+   -86,   -86,   -70,   -86,   -60,   -86,   -86,   -86,   -86,   -65,
+   -86,   -86,   -86,   -86,   -73,   -13,   -14,   -15,   -16,   -18,
+   -86,   -86,   -57,   -86,   -86,   -79,   -86,   -52,   -86,   -38,
+   -86,   -86,   -86,   -44,   -47,   -48,   -56,   -69,   -86,   -86,
+   -86,   -86,   -86,   -86,   -59,   -66,   -76,   -80,   -86,   -21,
+   -29,   -17,   -24,   -19,   -25,   -20,   -28,   -79,   -86,   -77,
+   -78,   -83,   -86,   -86,   -86,   -34,   -35,   -37,   -39,   -40,
+   -46,   -86,   -51,   -45,   -75,   -71,   -61,   -62,   -86,   -64,
+   -67,   -10,   -23,   -22,   -27,   -58,   -86,   -86,   -86,   -50,
+   -86,   -86,    -6,    -9,   -53,   -86,   -63,   -11,   -12,   -13,
+   -86,    -7,   -54,   -26,    -8 ]
 
 racc_goto_table = [
-     2,     9,    54,    35,    66,    53,    23,    37,    50,    26,
-    42,    40,    25,     3,     4,    24,    82,    49,    89,     1,
-   nil,   nil,   nil,   nil,   nil,   nil,    67,    61,   nil,    63,
-    64,   nil,   nil,   nil,    93,    94,    95,   nil,    97,   nil,
-   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    35,   nil,   nil,   nil,    91,   nil,
-    86,   nil,    88,    85,    98,   100,    42,   nil,   nil,   nil,
-   nil,   110,   nil,   nil,   nil,   nil,   nil,    99,   nil,   nil,
-   nil,   nil,   nil,   102,   nil,   nil,   104,   nil,   nil,   nil,
-   112,   nil,   nil,   nil,   nil,   nil,   nil,   107,   nil,   nil,
-   nil,   nil,   nil,   109 ]
+     2,     9,    77,    37,    52,    44,    24,    39,    27,    26,
+    42,    78,     1,   108,   102,   110,    25,    51,     4,     3,
+   137,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    73,    74,    75,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   115,   116,   117,   nil,   119,    85,   nil,   nil,   nil,
+   nil,   nil,    42,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    37,   nil,    37,   112,   125,   106,
+   105,   120,    44,   113,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,
+   nil,   nil,   136,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   127,   nil,   nil,   nil,   129,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   132,   nil,   nil,   nil,   nil,   nil,   135 ]
 
 racc_goto_check = [
-     2,     5,     8,     5,    15,    16,     2,     5,    18,    10,
-    13,    19,     9,     3,     4,     6,     7,     2,    14,     1,
-   nil,   nil,   nil,   nil,   nil,   nil,    16,     5,   nil,     5,
-     5,   nil,   nil,   nil,    15,    15,    15,   nil,    15,   nil,
-   nil,   nil,   nil,   nil,     5,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     5,   nil,   nil,   nil,     5,   nil,
-    10,   nil,    10,     9,    18,    16,    13,   nil,   nil,   nil,
-   nil,    15,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
-   nil,   nil,   nil,     2,   nil,   nil,     5,   nil,   nil,   nil,
-     8,   nil,   nil,   nil,   nil,   nil,   nil,     5,   nil,   nil,
-   nil,   nil,   nil,     2 ]
+     2,     5,    16,     5,    19,    14,     2,     5,    11,    10,
+    20,    17,     1,    13,     7,    15,     6,     2,     4,     3,
+     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     5,     5,     5,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    16,    16,    16,   nil,    16,     5,   nil,   nil,   nil,
+   nil,   nil,    20,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,     5,   nil,     5,     5,    17,    11,
+    10,    19,    14,    11,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,
+   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     2,   nil,   nil,   nil,     5,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     5,   nil,   nil,   nil,   nil,   nil,     2 ]
 
 racc_goto_pointer = [
-   nil,    19,     0,    13,    14,    -4,     8,   -41,   -16,     5,
-     2,   nil,   nil,    -7,   -44,   -34,   -13,   nil,    -9,    -2 ]
+   nil,    12,     0,    19,    18,    -4,     9,   -53,  -111,   nil,
+     2,     1,   nil,   -57,   -12,   -56,   -38,   -30,   nil,   -13,
+    -3 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,    52,   nil,   nil,   nil,   nil,
-   nil,    27,    28,    30,   nil,    10,   nil,    47,   nil,    12 ]
+   nil,   nil,   nil,   nil,   nil,    62,   nil,   nil,    64,    53,
+   nil,   nil,    28,    29,    33,   nil,    10,    63,    49,   nil,
+    12 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 33, :_reduce_1,
-  1, 33, :_reduce_2,
-  1, 33, :_reduce_3,
-  2, 35, :_reduce_4,
-  2, 36, :_reduce_5,
-  6, 34, :_reduce_6,
-  7, 34, :_reduce_7,
-  8, 34, :_reduce_8,
-  3, 40, :_reduce_9,
-  5, 40, :_reduce_10,
-  0, 38, :_reduce_11,
-  1, 38, :_reduce_12,
-  1, 38, :_reduce_13,
-  1, 41, :_reduce_14,
-  3, 41, :_reduce_15,
-  3, 41, :_reduce_16,
-  1, 43, :_reduce_17,
-  3, 43, :_reduce_18,
-  2, 43, :_reduce_19,
-  1, 43, :_reduce_20,
-  1, 42, :_reduce_21,
-  2, 42, :_reduce_22,
-  3, 42, :_reduce_23,
-  3, 45, :_reduce_24,
-  2, 44, :_reduce_25,
-  2, 44, :_reduce_26,
-  1, 44, :_reduce_27,
-  2, 46, :_reduce_28,
-  1, 46, :_reduce_29,
-  0, 39, :_reduce_30,
-  3, 39, :_reduce_31,
-  4, 39, :_reduce_32,
-  1, 37, :_reduce_33,
-  3, 37, :_reduce_34,
-  1, 48, :_reduce_35,
-  3, 48, :_reduce_36,
-  0, 49, :_reduce_none,
-  1, 49, :_reduce_38,
-  3, 49, :_reduce_39,
-  3, 49, :_reduce_40,
-  5, 49, :_reduce_41,
-  3, 49, :_reduce_42,
-  1, 50, :_reduce_43,
-  2, 50, :_reduce_44,
-  3, 50, :_reduce_45,
-  1, 47, :_reduce_46,
-  3, 47, :_reduce_47,
-  2, 47, :_reduce_48,
-  4, 47, :_reduce_49,
-  1, 51, :_reduce_50,
+  1, 37, :_reduce_1,
+  1, 37, :_reduce_2,
+  1, 37, :_reduce_3,
+  2, 39, :_reduce_4,
+  2, 40, :_reduce_5,
+  6, 38, :_reduce_6,
+  7, 38, :_reduce_7,
+  8, 38, :_reduce_8,
+  6, 38, :_reduce_9,
+  3, 44, :_reduce_10,
+  5, 44, :_reduce_11,
+  1, 45, :_reduce_12,
+  1, 45, :_reduce_13,
+  1, 45, :_reduce_14,
+  1, 45, :_reduce_15,
+  1, 45, :_reduce_16,
+  2, 45, :_reduce_17,
+  1, 45, :_reduce_18,
+  2, 45, :_reduce_19,
+  2, 45, :_reduce_20,
+  2, 45, :_reduce_21,
+  3, 45, :_reduce_22,
+  3, 45, :_reduce_23,
+  2, 45, :_reduce_24,
+  2, 45, :_reduce_25,
+  2, 45, :_reduce_26,
+  3, 45, :_reduce_27,
+  2, 45, :_reduce_28,
+  2, 45, :_reduce_29,
+  0, 42, :_reduce_30,
+  1, 42, :_reduce_31,
+  1, 42, :_reduce_32,
+  1, 46, :_reduce_33,
+  3, 46, :_reduce_34,
+  3, 46, :_reduce_35,
+  1, 48, :_reduce_36,
+  3, 48, :_reduce_37,
+  2, 48, :_reduce_38,
+  3, 48, :_reduce_39,
+  3, 48, :_reduce_40,
+  1, 48, :_reduce_41,
+  1, 48, :_reduce_42,
+  1, 47, :_reduce_43,
+  2, 47, :_reduce_44,
+  3, 47, :_reduce_45,
+  3, 50, :_reduce_46,
+  2, 49, :_reduce_47,
+  2, 49, :_reduce_48,
+  1, 49, :_reduce_49,
+  2, 51, :_reduce_50,
   1, 51, :_reduce_51,
-  1, 51, :_reduce_52,
-  4, 51, :_reduce_53,
-  3, 51, :_reduce_54,
-  3, 51, :_reduce_55,
-  3, 51, :_reduce_56,
-  2, 51, :_reduce_57,
-  3, 51, :_reduce_58,
-  1, 51, :_reduce_59,
-  1, 51, :_reduce_60,
-  3, 51, :_reduce_61,
-  1, 51, :_reduce_62 ]
-
-racc_reduce_n = 63
-
-racc_shift_n = 116
+  0, 43, :_reduce_52,
+  3, 43, :_reduce_53,
+  4, 43, :_reduce_54,
+  1, 41, :_reduce_55,
+  3, 41, :_reduce_56,
+  1, 53, :_reduce_57,
+  3, 53, :_reduce_58,
+  0, 54, :_reduce_none,
+  1, 54, :_reduce_60,
+  3, 54, :_reduce_61,
+  3, 54, :_reduce_62,
+  5, 54, :_reduce_63,
+  3, 54, :_reduce_64,
+  1, 55, :_reduce_65,
+  2, 55, :_reduce_66,
+  3, 55, :_reduce_67,
+  1, 52, :_reduce_68,
+  3, 52, :_reduce_69,
+  2, 52, :_reduce_70,
+  4, 52, :_reduce_71,
+  1, 56, :_reduce_72,
+  1, 56, :_reduce_73,
+  1, 56, :_reduce_74,
+  4, 56, :_reduce_75,
+  3, 56, :_reduce_76,
+  3, 56, :_reduce_77,
+  3, 56, :_reduce_78,
+  2, 56, :_reduce_79,
+  3, 56, :_reduce_80,
+  1, 56, :_reduce_81,
+  1, 56, :_reduce_82,
+  3, 56, :_reduce_83,
+  1, 56, :_reduce_84,
+  1, 56, :_reduce_85 ]
+
+racc_reduce_n = 86
+
+racc_shift_n = 145
 
 racc_token_table = {
   false => 0,
@@ -255,15 +322,19 @@ racc_token_table = {
   :RBRACE => 22,
   :LBRACKET => 23,
   :RBRACKET => 24,
-  :QUERY => 25,
-  :BANG => 26,
-  :STARSTAR => 27,
-  :STAR => 28,
-  :LESS => 29,
-  :GREATER => 30,
-  :EOF => 31 }
-
-racc_nt_base = 32
+  :COMP => 25,
+  :QUERY => 26,
+  :BANG => 27,
+  :STARSTAR => 28,
+  :STAR => 29,
+  :LESS => 30,
+  :GREATER => 31,
+  :EQUAL => 32,
+  :TILDE => 33,
+  :BIND => 34,
+  :EOF => 35 }
+
+racc_nt_base = 36
 
 racc_use_result_var = true
 
@@ -309,12 +380,16 @@ Racc_token_to_s_table = [
   "RBRACE",
   "LBRACKET",
   "RBRACKET",
+  "COMP",
   "QUERY",
   "BANG",
   "STARSTAR",
   "STAR",
   "LESS",
   "GREATER",
+  "EQUAL",
+  "TILDE",
+  "BIND",
   "EOF",
   "$start",
   "entry",
@@ -325,6 +400,7 @@ Racc_token_to_s_table = [
   "arg_list",
   "block",
   "method_sig_list",
+  "method_name",
   "nonempty_arg_list",
   "named_arg_list",
   "arg",
@@ -402,301 +478,456 @@ module_eval(<<'.,.,', 'parser.racc', 36)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 40)
+module_eval(<<'.,.,', 'parser.racc', 39)
   def _reduce_9(val, _values, result)
-     result = [val[0].to_sym, val[2]] 
+         	result = RDL::Type::MethodType.new(val[1], val[3], RDL::Type::ComputedType.new(val[5]))
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 41)
+module_eval(<<'.,.,', 'parser.racc', 43)
   def _reduce_10(val, _values, result)
-     result = [val[0].to_sym, val[2]] + val[4] 
+     result = [val[0], val[2]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 44)
   def _reduce_11(val, _values, result)
-     result = [] 
+     result = [val[0], val[2]] + val[4] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 45)
+module_eval(<<'.,.,', 'parser.racc', 47)
   def _reduce_12(val, _values, result)
-     result = val[0] 
+     result = val[0].to_sym 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 47)
+module_eval(<<'.,.,', 'parser.racc', 48)
   def _reduce_13(val, _values, result)
-          result = [RDL::Type::FiniteHashType.new(Hash[*val[0][0]], val[0][1])]
-      
+     result = :! 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 50)
+module_eval(<<'.,.,', 'parser.racc', 49)
   def _reduce_14(val, _values, result)
-     result = [val[0]] 
+     result = :* 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 51)
+module_eval(<<'.,.,', 'parser.racc', 50)
   def _reduce_15(val, _values, result)
-     result = val[2].unshift val[0] 
+     result = :** 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 52)
+module_eval(<<'.,.,', 'parser.racc', 51)
   def _reduce_16(val, _values, result)
-     # named arg list must come last
-      result = [val[0], RDL::Type::FiniteHashType.new(Hash[*val[2][0]], val[2][1])]
-      
+     result = :< 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 56)
+module_eval(<<'.,.,', 'parser.racc', 52)
   def _reduce_17(val, _values, result)
-     result = val[0] 
+     result = :<= 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 57)
+module_eval(<<'.,.,', 'parser.racc', 53)
   def _reduce_18(val, _values, result)
-     result = RDL::Type::DependentArgType.new(val[1], val[0], val[2]) 
+     result = :> 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 58)
+module_eval(<<'.,.,', 'parser.racc', 54)
   def _reduce_19(val, _values, result)
-     result = RDL::Type::AnnotatedArgType.new(val[1], val[0]) 
+     result = :>= 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 59)
+module_eval(<<'.,.,', 'parser.racc', 55)
   def _reduce_20(val, _values, result)
-     result = RDL::Type::DotsQuery.new 
+     result = :== 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 61)
+module_eval(<<'.,.,', 'parser.racc', 56)
   def _reduce_21(val, _values, result)
-     result = [val[0], nil] 
+     result = :!= 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 62)
+module_eval(<<'.,.,', 'parser.racc', 57)
   def _reduce_22(val, _values, result)
-     result = [[], val[1]] 
+     result = :=== 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 63)
+module_eval(<<'.,.,', 'parser.racc', 58)
   def _reduce_23(val, _values, result)
-     result = [val[0] + val[2][0], val[2][1]] 
+     result = :<=> 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 65)
+module_eval(<<'.,.,', 'parser.racc', 59)
   def _reduce_24(val, _values, result)
-     result = [val[0].to_sym, val[2]] 
+     result = :<< 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 68)
+module_eval(<<'.,.,', 'parser.racc', 60)
   def _reduce_25(val, _values, result)
-     result = RDL::Type::OptionalType.new val[1] 
+     result = :>> 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 69)
+module_eval(<<'.,.,', 'parser.racc', 61)
   def _reduce_26(val, _values, result)
-     result = RDL::Type::VarargType.new val[1] 
+     result = :[] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 70)
+module_eval(<<'.,.,', 'parser.racc', 62)
   def _reduce_27(val, _values, result)
-     result = val[0] 
+     result = :[]= 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 72)
+module_eval(<<'.,.,', 'parser.racc', 63)
   def _reduce_28(val, _values, result)
-     result = RDL::Type::OptionalType.new val[1] 
+     result = :=~ 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 73)
+module_eval(<<'.,.,', 'parser.racc', 64)
   def _reduce_29(val, _values, result)
-     result = val[0] 
+     result = :!~ 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 76)
+module_eval(<<'.,.,', 'parser.racc', 67)
   def _reduce_30(val, _values, result)
-     result = nil 
+     result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 77)
+module_eval(<<'.,.,', 'parser.racc', 68)
   def _reduce_31(val, _values, result)
-     result = val[1] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 78)
+module_eval(<<'.,.,', 'parser.racc', 70)
   def _reduce_32(val, _values, result)
-     result = RDL::Type::OptionalType.new val[2] 
+          result = [RDL::Type::FiniteHashType.new(Hash[*val[0][0]], val[0][1])]
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 81)
+module_eval(<<'.,.,', 'parser.racc', 73)
   def _reduce_33(val, _values, result)
-     result = val[0] 
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 82)
+module_eval(<<'.,.,', 'parser.racc', 74)
   def _reduce_34(val, _values, result)
-     result = val[1] 
+     result = val[2].unshift val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 85)
+module_eval(<<'.,.,', 'parser.racc', 75)
   def _reduce_35(val, _values, result)
-     result = [val[0]] 
+     # named arg list must come last
+      result = [val[0], RDL::Type::FiniteHashType.new(Hash[*val[2][0]], val[2][1])]
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 86)
+module_eval(<<'.,.,', 'parser.racc', 79)
   def _reduce_36(val, _values, result)
-     result = [val[0]] + val[2] 
+     result = val[0] 
     result
   end
 .,.,
 
-# reduce 37 omitted
+module_eval(<<'.,.,', 'parser.racc', 80)
+  def _reduce_37(val, _values, result)
+     result = RDL::Type::DependentArgType.new(val[1], val[0], val[2]) 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'parser.racc', 89)
+module_eval(<<'.,.,', 'parser.racc', 81)
   def _reduce_38(val, _values, result)
-     result = val[0] 
+     result = RDL::Type::AnnotatedArgType.new(val[1], val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 90)
+module_eval(<<'.,.,', 'parser.racc', 82)
   def _reduce_39(val, _values, result)
-     result = [val[0].to_i, val[2]] 
+     result = RDL::Type::BoundArgType.new(val[0], val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 91)
+module_eval(<<'.,.,', 'parser.racc', 83)
   def _reduce_40(val, _values, result)
-     result = [val[0].to_f, val[2]] 
+     result = RDL::Type::BoundArgType.new(val[0], RDL::Type::ComputedType.new(val[2])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 93)
+module_eval(<<'.,.,', 'parser.racc', 84)
   def _reduce_41(val, _values, result)
-        result = [Kernel.const_get(val[0]), val[2]]
-  
+     result = RDL::Type::ComputedType.new(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 95)
+module_eval(<<'.,.,', 'parser.racc', 85)
   def _reduce_42(val, _values, result)
-     result = [val[0], val[2]] 
+     result = RDL::Type::DotsQuery.new 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 98)
+module_eval(<<'.,.,', 'parser.racc', 87)
   def _reduce_43(val, _values, result)
      result = [val[0], nil] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 99)
+module_eval(<<'.,.,', 'parser.racc', 88)
   def _reduce_44(val, _values, result)
      result = [[], val[1]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 100)
+module_eval(<<'.,.,', 'parser.racc', 89)
   def _reduce_45(val, _values, result)
      result = [val[0] + val[2][0], val[2][1]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 103)
+module_eval(<<'.,.,', 'parser.racc', 91)
   def _reduce_46(val, _values, result)
+     result = [val[0].to_sym, val[2]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 94)
+  def _reduce_47(val, _values, result)
+     result = RDL::Type::OptionalType.new val[1] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 95)
+  def _reduce_48(val, _values, result)
+     result = RDL::Type::VarargType.new val[1] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 96)
+  def _reduce_49(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 98)
+  def _reduce_50(val, _values, result)
+     result = RDL::Type::OptionalType.new val[1] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 99)
+  def _reduce_51(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
+module_eval(<<'.,.,', 'parser.racc', 102)
+  def _reduce_52(val, _values, result)
+     result = nil 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 103)
+  def _reduce_53(val, _values, result)
+     result = val[1] 
+    result
+  end
+.,.,
+
 module_eval(<<'.,.,', 'parser.racc', 104)
-  def _reduce_47(val, _values, result)
+  def _reduce_54(val, _values, result)
+     result = RDL::Type::OptionalType.new val[2] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 107)
+  def _reduce_55(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 108)
+  def _reduce_56(val, _values, result)
+     result = val[1] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 111)
+  def _reduce_57(val, _values, result)
+     result = [val[0]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 112)
+  def _reduce_58(val, _values, result)
+     result = [val[0]] + val[2] 
+    result
+  end
+.,.,
+
+# reduce 59 omitted
+
+module_eval(<<'.,.,', 'parser.racc', 115)
+  def _reduce_60(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 116)
+  def _reduce_61(val, _values, result)
+     result = [val[0].to_i, val[2]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 117)
+  def _reduce_62(val, _values, result)
+     result = [val[0].to_f, val[2]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 119)
+  def _reduce_63(val, _values, result)
+        result = [Kernel.const_get(val[0]), val[2]]
+  
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 121)
+  def _reduce_64(val, _values, result)
+     result = [val[0], val[2]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 124)
+  def _reduce_65(val, _values, result)
+     result = [val[0], nil] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 125)
+  def _reduce_66(val, _values, result)
+     result = [[], val[1]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 126)
+  def _reduce_67(val, _values, result)
+     result = [val[0] + val[2][0], val[2][1]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 129)
+  def _reduce_68(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 130)
+  def _reduce_69(val, _values, result)
      result = RDL::Type::UnionType.new val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 105)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 131)
+  def _reduce_70(val, _values, result)
      result = RDL::Type::NonNullType.new val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 106)
-  def _reduce_49(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 132)
+  def _reduce_71(val, _values, result)
      result = RDL::Type::UnionType.new(RDL::Type::NonNullType.new(val[1]), val[3]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 109)
-  def _reduce_50(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 135)
+  def _reduce_72(val, _values, result)
      result = RDL::Type::SingletonType.new(val[0].to_sym) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 111)
-  def _reduce_51(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 137)
+  def _reduce_73(val, _values, result)
           if val[0] == 'nil' then
         result = RDL::Globals.types[:nil]
       elsif val[0] == 'true' then
@@ -713,8 +944,8 @@ module_eval(<<'.,.,', 'parser.racc', 111)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 124)
-  def _reduce_52(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 150)
+  def _reduce_74(val, _values, result)
           if RDL::Globals.special_types.has_key? val[0] then
         result = RDL::Globals.special_types[val[0]]
       else
@@ -725,77 +956,84 @@ module_eval(<<'.,.,', 'parser.racc', 124)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 131)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 157)
+  def _reduce_75(val, _values, result)
           result = RDL::Type::GenericType.new(val[0], *val[2])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 133)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 159)
+  def _reduce_76(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 135)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 161)
+  def _reduce_77(val, _values, result)
           result = RDL::Type::TupleType.new(*val[1])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 138)
-  def _reduce_56(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 164)
+  def _reduce_78(val, _values, result)
           result = RDL::Type::StructuralType.new(Hash[*val[1]])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 141)
-  def _reduce_57(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 167)
+  def _reduce_79(val, _values, result)
           result = RDL::Type::TupleType.new
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 144)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 170)
+  def _reduce_80(val, _values, result)
           result = RDL::Type::FiniteHashType.new(Hash[*val[1][0]], val[1][1])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 146)
-  def _reduce_59(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 172)
+  def _reduce_81(val, _values, result)
      result = RDL::Type::SingletonType.new(val[0].to_i) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 147)
-  def _reduce_60(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 173)
+  def _reduce_82(val, _values, result)
      result = RDL::Type::SingletonType.new(val[0].to_f) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 149)
-  def _reduce_61(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 175)
+  def _reduce_83(val, _values, result)
           result =  RDL::Type::SingletonType.new(Kernel.const_get(val[1]))
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 153)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 178)
+  def _reduce_84(val, _values, result)
+     result = RDL::Type::PreciseStringType.new(val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 179)
+  def _reduce_85(val, _values, result)
      result = RDL::Type::WildQuery.new 
     result
   end