rdl 1.0.0 → 1.0.1.rc1

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

@@ -103,12 +103,21 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\*/))
          action { [:STAR, text] }
 
-      when (text = @ss.scan(/\#\#/))
-         action { [:DOUBLE_HASH, text] }
+      when (text = @ss.scan(/\#T/))
+         action { [:HASH_TYPE, text] }
+
+      when (text = @ss.scan(/\#Q/))
+         action { [:HASH_QUERY, text] }
 
       when (text = @ss.scan(/\$\{/))
          action { [:CONST_BEGIN, text] }
 
+      when (text = @ss.scan(/\.\.\./))
+         action { [:DOTS, text] }
+
+      when (text = @ss.scan(/\./))
+         action { [:DOT, text] }
+
       when (text = @ss.scan(/-?\d\.\d+/))
          action { [:FLOAT, text] } # Must go before FIXNUM
 

data/lib/rdl/types/method.rb

@@ -11,7 +11,7 @@ module RDL::Type
     attr_reader :ret
 
     @@contract_cache = {}
-    
+
     # Create a new MethodType
     #
     # [+args+] List of types of the arguments of the procedure (use [] for no args).
@@ -190,13 +190,13 @@ RUBY
         return false # one has a block and the other doesn't
       end
     end
-    
+
     def instantiate(inst)
       return MethodType.new(@args.map { |arg| arg.instantiate(inst) },
                             @block ? @block.instantiate(inst) : nil,
                             @ret.instantiate(inst))
     end
-    
+
     def eql?(other)
       self == other
     end
@@ -209,6 +209,44 @@ RUBY
         (other.ret == @ret)
     end
 
+    # other may not be a query
+    def match(other)
+      other = other.type if other.instance_of? AnnotatedArgType
+      return true if other.instance_of? WildQuery
+      return false unless @ret.match(other.ret)
+      if @block == nil
+        return false unless other.block == nil
+      else
+        return false if other.block == nil
+        return false unless @block.match(other.block)
+      end
+      # Check arg matches; logic is similar to pre_cond
+      states = [[0,0]] # [position in self, position in other]
+      until states.empty?
+        s_arg, o_arg = states.pop
+        return true if s_arg == @args.size && o_arg == other.args.size # everything matches
+        next if s_arg >= @args.size # match not possible, not enough args in self
+        if @args[s_arg].instance_of? DotsQuery then
+          if o_arg == other.args.size
+            # no args left in other, skip ...
+            states << [s_arg+1, o_arg]
+          else
+            states << [s_arg+1, o_arg+1] # match, no more matches to ...
+            states << [s_arg, o_arg+1]   # match, more matches to ... coming
+          end
+        else
+          next if o_arg == other.args.size # match not possible, not enough args in other
+          s_arg_t = @args[s_arg]
+          s_arg_t = s_arg_t.type if s_arg_t.instance_of? AnnotatedArgType
+          o_arg_t = other.args[o_arg]
+          o_arg_t = o_arg_t.type if o_arg_t.instance_of? AnnotatedArgType
+          next unless s_arg_t.match(o_arg_t)
+          states << [s_arg+1, o_arg+1]
+        end
+      end
+      return false
+    end
+
     def hash  # :nodoc:
       h = (37 + @ret.hash) * 41 + @args.hash
       h = h * 31 + @block.hash if @block
@@ -216,4 +254,3 @@ RUBY
     end
 end
 end
-

data/lib/rdl/types/nil.rb

@@ -29,6 +29,12 @@ module RDL::Type
       other.instance_of? NilType
     end
 
+    def match(other)
+      other = other.type if other.instance_of? AnnotatedArgType
+      return true if other.instance_of? WildQuery
+      return self == other
+    end
+
     def <=(other)
       true
     end
@@ -38,11 +44,11 @@ module RDL::Type
       return t <= self if t
       obj.nil?
     end
-    
+
     def instantiate(inst)
       return self
     end
-    
+
     def hash
       13
     end

data/lib/rdl/types/nominal.rb

@@ -3,7 +3,7 @@ require_relative 'type'
 module RDL::Type
   class NominalType < Type
     attr_reader :name # string
-    
+
     @@cache = {}
 
     class << self
@@ -31,6 +31,12 @@ module RDL::Type
       return (other.instance_of? self.class) && (other.name == @name)
     end
 
+    def match(other)
+      other = other.type if other.instance_of? AnnotatedArgType
+      return true if other.instance_of? WildQuery
+      return self == other
+    end
+
     def hash # :nodoc:
       return @name.hash
     end
@@ -72,7 +78,7 @@ module RDL::Type
       return true if obj.nil?
       return obj.is_a? klass
     end
-    
+
     def instantiate(inst)
       return self
     end

data/lib/rdl/types/optional.rb

@@ -13,7 +13,7 @@ module RDL::Type
     def self.new(type)
       t = @@cache[type]
       return t if t
-      raise RuntimeError, "Attempt to create vararg type with non-type" unless type.is_a? Type
+      raise RuntimeError, "Attempt to create optional type with non-type" unless type.is_a? Type
       t = OptionalType.__new__ type
       return (@@cache[type] = t) # assignment evaluates to t
     end
@@ -41,12 +41,18 @@ module RDL::Type
       return (other.instance_of? OptionalType) && (other.type == @type)
     end
 
+    def match(other)
+      other = other.type if other.instance_of? AnnotatedArgType
+      return true if other.instance_of? WildQuery
+      return (other.instance_of? OptionalType) && (@type.match(other.type))
+    end
+
     # Note: no member?, because these can only appear in MethodType, where they're handled specially
-    
+
     def instantiate(inst)
       return OptionalType.new(@type.instantiate(inst))
     end
-    
+
     def hash # :nodoc:
       return 57 + @type.hash
     end

data/lib/rdl/types/parser.racc

@@ -7,8 +7,8 @@ class Parser
 
   start entry
 
-token DOUBLE_HASH CONST_BEGIN RASSOC
-token OR FIXNUM FLOAT COLON RARROW ID SYMBOL SPECIAL_ID STRING
+token HASH_TYPE HASH_QUERY CONST_BEGIN RASSOC
+token OR FIXNUM FLOAT COLON RARROW DOT DOTS ID SYMBOL SPECIAL_ID STRING
 token LPAREN RPAREN LBRACE RBRACE LBRACKET RBRACKET
 token COMMA QUERY STAR LESS GREATER
 token EOF
@@ -18,11 +18,13 @@ rule
   entry:
       method_type { result = val[0] }
     | bare_type { result = val[0] }
+    | query_type { result = val[0] }
 
   bare_type:
-      DOUBLE_HASH type_expr {
-        result = val[1]
-      }
+      HASH_TYPE type_expr { result = val[1] }
+
+  query_type:
+      HASH_QUERY method_type { result = RDL::Type::MethodType.new val[1].args, val[1].block, val[1].ret }
 
   method_type:
       LPAREN arg_list RPAREN block RARROW type_expr {
@@ -51,6 +53,7 @@ rule
   arg:
       base_arg { result = val[0] }
     | base_arg ID { result = RDL::Type::AnnotatedArgType.new(val[1], val[0]) }
+    | DOTS { result = RDL::Type::DotsQuery.new }
   named_arg_list:
       named_arg { result = val[0] }
     | named_arg COMMA named_arg_list { result = val[0] + val[2] }
@@ -112,7 +115,7 @@ rule
         fail "Unexpected special type identifier #{val[0]}"
       end
     }
-    | ID LESS type_expr_comma_list GREATER { 
+    | ID LESS type_expr_comma_list GREATER {
       n = RDL::Type::NominalType.new(val[0])
       result = RDL::Type::GenericType.new(n, *val[2])
     }
@@ -132,6 +135,7 @@ rule
     }
 # The following can't be used in SingletonTypes because those compare using .equal?
 #    | STRING { result = RDL::Type::SingletonType.new(val[0]) }
+    | DOT { result = RDL::Type::WildQuery.new }
 
 ---- header ----
 

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

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -13,7 +13,7 @@ module RDL::Type
 
 class Parser < Racc::Parser
 
-module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 143)
+module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 147)
 
 def initialize()
   @yydebug = true
@@ -23,162 +23,176 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    18,    56,    16,    17,    62,    25,    11,    13,    50,     9,
-    58,    15,    59,    14,    32,    26,    27,    18,    50,    16,
-    17,    32,    25,    11,    13,     4,     9,    60,    15,    61,
-    14,    57,    26,    27,    18,     5,    16,    17,    63,    12,
-    11,    13,    64,     9,    65,    15,    66,    14,    18,    73,
-    16,    17,    68,    12,    11,    13,    53,    37,    49,    15,
-    18,    14,    16,    17,    75,    12,    11,    13,     5,     9,
-    48,    15,    18,    14,    16,    17,    47,    12,    11,    13,
-    46,     9,    80,    15,    18,    14,    16,    17,    45,    12,
-    11,    13,    32,     9,    83,    15,    18,    14,    16,    17,
-     5,    12,    11,    13,    31,     9,    86,    15,    18,    14,
-    16,    17,    87,    33,    11,    13,    29,     9,    89,    15,
-    18,    14,    16,    17,    90,    12,    11,    13,     6,    93,
-    56,    15,    18,    14,    16,    17,   nil,    12,    11,    13,
-   nil,     9,   nil,    15,    18,    14,    16,    17,   nil,    12,
-    11,    13,   nil,   nil,   nil,    15,    18,    14,    16,    17,
-   nil,    12,    11,    13,   nil,     9,   nil,    15,    18,    14,
-    16,    17,   nil,    12,    11,    13,   nil,   nil,   nil,    15,
-    18,    14,    16,    17,   nil,    12,    11,    13,   nil,     9,
-   nil,    15,    18,    14,    16,    17,   nil,    12,    11,    13,
-   nil,     9,   nil,    15,    18,    14,    16,    17,   nil,    12,
-    11,    13,   nil,   nil,   nil,    15,    41,    14,    39,    40,
-    41,    37,    39,    40,    42,    37,   nil,   nil,    42 ]
+    20,    55,    18,    19,    71,    21,    28,    30,    13,    15,
+    73,    11,    42,    17,    61,    16,    37,    31,    32,    20,
+    80,    18,    19,     7,    21,    28,    30,    13,    15,    37,
+    11,    85,    17,    88,    16,     7,    31,    32,    20,    91,
+    18,    19,    92,    21,    94,    14,    13,    15,    95,    11,
+    98,    17,    61,    16,    20,    78,    18,    19,     8,    21,
+     7,    14,    13,    15,    34,    11,    36,    17,    20,    16,
+    18,    19,    37,    21,    50,    14,    13,    15,    51,     5,
+     6,    17,    20,    16,    18,    19,    52,    21,    53,    14,
+    13,    15,     7,    54,    58,    17,    20,    16,    18,    19,
+    62,    21,    63,    14,    13,    15,    64,    55,    65,    17,
+    20,    16,    18,    19,    66,    21,    67,    14,    13,    15,
+    68,    11,    69,    17,    20,    16,    18,    19,    70,    21,
+   nil,    14,    13,    15,   nil,    11,   nil,    17,    20,    16,
+    18,    19,   nil,    21,   nil,    38,    13,    15,   nil,    11,
+   nil,    17,    20,    16,    18,    19,   nil,    21,   nil,    14,
+    13,    15,   nil,    11,   nil,    17,    20,    16,    18,    19,
+   nil,    21,   nil,    14,    13,    15,   nil,   nil,   nil,    17,
+    20,    16,    18,    19,   nil,    21,   nil,    14,    13,    15,
+   nil,    11,   nil,    17,    20,    16,    18,    19,   nil,    21,
+   nil,    14,    13,    15,   nil,    11,   nil,    17,    20,    16,
+    18,    19,   nil,    21,   nil,    14,    13,    15,   nil,    11,
+   nil,    17,    20,    16,    18,    19,   nil,    21,   nil,    14,
+    13,    15,   nil,   nil,   nil,    17,    20,    16,    18,    19,
+   nil,    21,   nil,    14,    13,    15,   nil,    11,   nil,    17,
+    46,    16,    44,    45,   nil,   nil,    46,    42,    44,    45,
+    47,   nil,   nil,    42,   nil,   nil,    47 ]
 
 racc_action_check = [
-     5,    33,     5,     5,    41,     5,     5,     5,    25,     5,
-    35,     5,    36,     5,    33,     5,     5,    47,    37,    47,
-    47,    25,    47,    47,    47,     0,    47,    39,    47,    40,
-    47,    34,    47,    47,    50,     0,    50,    50,    42,    50,
-    50,    50,    43,    50,    44,    50,    45,    50,    31,    50,
-    31,    31,    46,    31,    31,    31,    30,    49,    24,    31,
-    83,    31,    83,    83,    55,    83,    83,    83,    56,    83,
-    23,    83,     9,    83,     9,     9,    22,     9,     9,     9,
-    19,     9,    62,     9,    73,     9,    73,    73,    18,    73,
-    73,    73,    12,    73,    67,    73,    32,    73,    32,    32,
-    68,    32,    32,    32,    10,    32,    76,    32,    14,    32,
-    14,    14,    80,    14,    14,    14,     6,    14,    84,    14,
-    63,    14,    63,    63,    86,    63,    63,    63,     1,    88,
-    90,    63,     4,    63,     4,     4,   nil,     4,     4,     4,
-   nil,     4,   nil,     4,    60,     4,    60,    60,   nil,    60,
-    60,    60,   nil,   nil,   nil,    60,    57,    60,    57,    57,
-   nil,    57,    57,    57,   nil,    57,   nil,    57,    87,    57,
-    87,    87,   nil,    87,    87,    87,   nil,   nil,   nil,    87,
-    26,    87,    26,    26,   nil,    26,    26,    26,   nil,    26,
-   nil,    26,    27,    26,    27,    27,   nil,    27,    27,    27,
-   nil,    27,   nil,    27,    61,    27,    61,    61,   nil,    61,
-    61,    61,   nil,   nil,   nil,    61,    64,    61,    64,    64,
-    15,    64,    15,    15,    64,    15,   nil,   nil,    15 ]
+     7,    30,     7,     7,    50,     7,     7,     7,     7,     7,
+    51,     7,    54,     7,    38,     7,    30,     7,     7,    52,
+    60,    52,    52,    61,    52,    52,    52,    52,    52,    38,
+    52,    67,    52,    72,    52,    73,    52,    52,    55,    81,
+    55,    55,    85,    55,    89,    55,    55,    55,    91,    55,
+    93,    55,    95,    55,    62,    55,    62,    62,     1,    62,
+     6,    62,    62,    62,     8,    62,    12,    62,    65,    62,
+    65,    65,    14,    65,    20,    65,    65,    65,    23,     0,
+     0,    65,    66,    65,    66,    66,    26,    66,    27,    66,
+    66,    66,     0,    29,    35,    66,    68,    66,    68,    68,
+    39,    68,    40,    68,    68,    68,    41,    42,    44,    68,
+    31,    68,    31,    31,    45,    31,    46,    31,    31,    31,
+    47,    31,    48,    31,     5,    31,     5,     5,    49,     5,
+   nil,     5,     5,     5,   nil,     5,   nil,     5,    16,     5,
+    16,    16,   nil,    16,   nil,    16,    16,    16,   nil,    16,
+   nil,    16,    37,    16,    37,    37,   nil,    37,   nil,    37,
+    37,    37,   nil,    37,   nil,    37,    92,    37,    92,    92,
+   nil,    92,   nil,    92,    92,    92,   nil,   nil,   nil,    92,
+    32,    92,    32,    32,   nil,    32,   nil,    32,    32,    32,
+   nil,    32,   nil,    32,    78,    32,    78,    78,   nil,    78,
+   nil,    78,    78,    78,   nil,    78,   nil,    78,    11,    78,
+    11,    11,   nil,    11,   nil,    11,    11,    11,   nil,    11,
+   nil,    11,    36,    11,    36,    36,   nil,    36,   nil,    36,
+    36,    36,   nil,   nil,   nil,    36,    88,    36,    88,    88,
+   nil,    88,   nil,    88,    88,    88,   nil,    88,   nil,    88,
+    69,    88,    69,    69,   nil,   nil,    17,    69,    17,    17,
+    69,   nil,   nil,    17,   nil,   nil,    17 ]
 
 racc_action_pointer = [
-    20,   128,   nil,   nil,   126,    -6,   116,   nil,   nil,    66,
-   100,   nil,    69,   nil,   102,   214,   nil,   nil,    77,    64,
-   nil,   nil,    74,    59,    56,    -2,   174,   186,   nil,   nil,
-    40,    42,    90,    -9,    29,   -10,    -8,     8,   nil,    20,
-    22,    -7,    31,    40,    26,    28,    35,    11,   nil,    46,
-    28,   nil,   nil,   nil,   nil,    40,    53,   150,   nil,   nil,
-   138,   198,    64,   114,   210,   nil,   nil,    91,    85,   nil,
-   nil,   nil,   nil,    78,   nil,   nil,   104,   nil,   nil,   nil,
-   105,   nil,   nil,    54,   100,   nil,   113,   162,   118,   nil,
-   120,   nil,   nil,   nil ]
+    74,    58,   nil,   nil,   nil,   117,    42,    -7,    64,   nil,
+   nil,   201,    62,   nil,    46,   nil,   131,   249,   nil,   nil,
+    60,   nil,   nil,    59,   nil,   nil,    84,    74,   nil,    91,
+   -10,   103,   173,   nil,   nil,    75,   215,   145,     3,    98,
+    79,    83,    96,   nil,   100,   106,   102,   112,   120,   107,
+   -17,   -10,    12,   nil,    -2,    31,   nil,   nil,   nil,   nil,
+    -7,     5,    47,   nil,   nil,    61,    75,    10,    89,   243,
+   nil,   nil,    30,    17,   nil,   nil,   nil,   nil,   187,   nil,
+   nil,    37,   nil,   nil,   nil,    34,   nil,   nil,   229,    23,
+   nil,    34,   159,    36,   nil,    41,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -50,   -50,    -1,    -2,   -50,    -8,   -50,    -3,   -26,   -50,
-   -38,   -40,   -41,   -42,   -50,   -30,   -47,   -48,   -50,   -50,
-    -9,   -10,   -11,   -14,   -16,   -41,   -50,   -50,   -21,    94,
-   -50,   -50,   -50,   -41,   -28,   -50,   -50,   -50,   -31,   -50,
-   -50,   -50,   -50,   -36,   -50,   -50,   -24,   -50,   -15,   -50,
-   -50,   -19,   -20,   -27,   -39,   -50,   -50,   -50,   -44,   -45,
-   -50,   -50,   -50,   -50,   -30,   -46,   -49,   -50,   -50,   -12,
-   -13,   -17,   -18,   -50,   -23,   -43,    -6,   -29,   -32,   -33,
-   -50,   -35,   -37,   -50,   -50,   -22,   -50,   -50,    -4,   -25,
-   -50,    -7,   -34,    -5 ]
+   -54,   -54,    -1,    -2,    -3,   -54,   -54,   -10,   -54,    -4,
+   -29,   -54,   -41,   -43,   -44,   -45,   -54,   -33,   -50,   -51,
+   -54,   -53,    -5,   -54,   -11,   -12,   -13,   -16,   -18,   -19,
+   -44,   -54,   -54,   -24,    99,   -54,   -54,   -54,   -44,   -31,
+   -54,   -54,   -54,   -34,   -54,   -54,   -54,   -54,   -39,   -54,
+   -54,   -27,   -54,   -17,   -54,   -54,   -22,   -23,   -30,   -42,
+   -54,   -54,   -54,   -47,   -48,   -54,   -54,   -54,   -54,   -33,
+   -49,   -52,   -54,   -54,   -14,   -15,   -20,   -21,   -54,   -26,
+   -46,    -8,   -32,   -35,   -36,   -54,   -38,   -40,   -54,   -54,
+   -25,   -54,   -54,    -6,   -28,   -54,    -9,   -37,    -7 ]
 
 racc_goto_table = [
-     7,    28,    36,     2,    54,    30,    44,    38,    21,    20,
-    35,    67,    72,    19,     3,     1,   nil,   nil,   nil,   nil,
-   nil,   nil,    51,    52,   nil,   nil,   nil,   nil,    55,   nil,
-   nil,   nil,   nil,    78,    79,   nil,    81,   nil,   nil,   nil,
-   nil,   nil,   nil,    28,   nil,   nil,    74,   nil,   nil,   nil,
-    70,    69,    71,    77,   nil,    82,    38,   nil,   nil,    76,
-    92,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    85,
-   nil,    84,   nil,   nil,    91,   nil,   nil,   nil,   nil,    88 ]
+     9,    41,    33,    59,     2,    49,    35,    25,    43,    40,
+    22,    24,    77,     3,    72,    23,     4,     1,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    56,    57,   nil,   nil,
+    60,   nil,    83,    84,   nil,    86,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,   nil,   nil,
+    79,   nil,    75,   nil,    76,    82,    74,    87,   nil,    97,
+    43,   nil,   nil,   nil,   nil,    81,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    90,   nil,   nil,    96,    89,   nil,   nil,
+   nil,   nil,   nil,    93 ]
 
 racc_goto_check = [
-     4,     4,     7,     2,    14,     4,    17,    12,     9,     8,
-    15,     6,    13,     5,     3,     1,   nil,   nil,   nil,   nil,
-   nil,   nil,     4,     4,   nil,   nil,   nil,   nil,    15,   nil,
-   nil,   nil,   nil,    14,    14,   nil,    14,   nil,   nil,   nil,
-   nil,   nil,   nil,     4,   nil,   nil,     4,   nil,   nil,   nil,
-     9,     8,     9,    15,   nil,    17,    12,   nil,   nil,     2,
-    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,
-   nil,     2,   nil,   nil,     7,   nil,   nil,   nil,   nil,     4 ]
+     5,     8,     5,    15,     2,    18,     5,    10,    13,    16,
+     2,     9,    14,     3,     7,     6,     4,     1,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     5,     5,   nil,   nil,
+    16,   nil,    15,    15,   nil,    15,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,   nil,   nil,
+     5,   nil,    10,   nil,    10,    16,     9,    18,   nil,    15,
+    13,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     5,   nil,   nil,     8,     2,   nil,   nil,
+   nil,   nil,   nil,     5 ]
 
 racc_goto_pointer = [
-   nil,    15,     3,    14,    -4,     8,   -35,   -12,     4,     3,
-   nil,   nil,    -8,   -38,   -27,    -4,   nil,    -9,   nil ]
+   nil,    17,     4,    13,    16,    -5,     8,   -37,   -15,     4,
+     0,   nil,   nil,    -9,   -43,   -33,    -7,   nil,   -12,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,    34,   nil,   nil,   nil,   nil,   nil,
-    22,    23,    24,   nil,     8,   nil,    43,   nil,    10 ]
+   nil,   nil,   nil,   nil,   nil,    39,   nil,   nil,   nil,   nil,
+   nil,    26,    27,    29,   nil,    10,   nil,    48,   nil,    12 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 27, :_reduce_1,
-  1, 27, :_reduce_2,
-  2, 29, :_reduce_3,
-  6, 28, :_reduce_4,
-  7, 28, :_reduce_5,
-  3, 33, :_reduce_6,
-  5, 33, :_reduce_7,
-  0, 31, :_reduce_8,
-  1, 31, :_reduce_9,
-  1, 31, :_reduce_10,
-  1, 34, :_reduce_11,
-  3, 34, :_reduce_12,
-  3, 34, :_reduce_13,
-  1, 36, :_reduce_14,
-  2, 36, :_reduce_15,
-  1, 35, :_reduce_16,
-  3, 35, :_reduce_17,
-  3, 38, :_reduce_18,
-  2, 37, :_reduce_19,
-  2, 37, :_reduce_20,
-  1, 37, :_reduce_21,
-  2, 39, :_reduce_22,
-  1, 39, :_reduce_23,
-  0, 32, :_reduce_24,
-  3, 32, :_reduce_25,
-  1, 30, :_reduce_26,
-  3, 30, :_reduce_27,
-  1, 41, :_reduce_28,
-  3, 41, :_reduce_29,
-  0, 42, :_reduce_none,
-  1, 42, :_reduce_31,
-  3, 42, :_reduce_32,
-  3, 42, :_reduce_33,
-  5, 42, :_reduce_34,
-  3, 42, :_reduce_35,
-  1, 43, :_reduce_36,
-  3, 43, :_reduce_37,
-  1, 40, :_reduce_38,
-  3, 40, :_reduce_39,
-  1, 44, :_reduce_40,
+  1, 30, :_reduce_1,
+  1, 30, :_reduce_2,
+  1, 30, :_reduce_3,
+  2, 32, :_reduce_4,
+  2, 33, :_reduce_5,
+  6, 31, :_reduce_6,
+  7, 31, :_reduce_7,
+  3, 37, :_reduce_8,
+  5, 37, :_reduce_9,
+  0, 35, :_reduce_10,
+  1, 35, :_reduce_11,
+  1, 35, :_reduce_12,
+  1, 38, :_reduce_13,
+  3, 38, :_reduce_14,
+  3, 38, :_reduce_15,
+  1, 40, :_reduce_16,
+  2, 40, :_reduce_17,
+  1, 40, :_reduce_18,
+  1, 39, :_reduce_19,
+  3, 39, :_reduce_20,
+  3, 42, :_reduce_21,
+  2, 41, :_reduce_22,
+  2, 41, :_reduce_23,
+  1, 41, :_reduce_24,
+  2, 43, :_reduce_25,
+  1, 43, :_reduce_26,
+  0, 36, :_reduce_27,
+  3, 36, :_reduce_28,
+  1, 34, :_reduce_29,
+  3, 34, :_reduce_30,
+  1, 45, :_reduce_31,
+  3, 45, :_reduce_32,
+  0, 46, :_reduce_none,
+  1, 46, :_reduce_34,
+  3, 46, :_reduce_35,
+  3, 46, :_reduce_36,
+  5, 46, :_reduce_37,
+  3, 46, :_reduce_38,
+  1, 47, :_reduce_39,
+  3, 47, :_reduce_40,
   1, 44, :_reduce_41,
-  1, 44, :_reduce_42,
-  4, 44, :_reduce_43,
-  3, 44, :_reduce_44,
-  3, 44, :_reduce_45,
-  3, 44, :_reduce_46,
-  1, 44, :_reduce_47,
-  1, 44, :_reduce_48,
-  3, 44, :_reduce_49 ]
-
-racc_reduce_n = 50
-
-racc_shift_n = 94
+  3, 44, :_reduce_42,
+  1, 48, :_reduce_43,
+  1, 48, :_reduce_44,
+  1, 48, :_reduce_45,
+  4, 48, :_reduce_46,
+  3, 48, :_reduce_47,
+  3, 48, :_reduce_48,
+  3, 48, :_reduce_49,
+  1, 48, :_reduce_50,
+  1, 48, :_reduce_51,
+  3, 48, :_reduce_52,
+  1, 48, :_reduce_53 ]
+
+racc_reduce_n = 54
+
+racc_shift_n = 99
 
 racc_token_table = {
   false => 0,
@@ -186,29 +200,32 @@ racc_token_table = {
   :COMMA => 2,
   :RARROW => 3,
   :OR => 4,
-  :DOUBLE_HASH => 5,
-  :CONST_BEGIN => 6,
-  :RASSOC => 7,
-  :FIXNUM => 8,
-  :FLOAT => 9,
-  :COLON => 10,
-  :ID => 11,
-  :SYMBOL => 12,
-  :SPECIAL_ID => 13,
-  :STRING => 14,
-  :LPAREN => 15,
-  :RPAREN => 16,
-  :LBRACE => 17,
-  :RBRACE => 18,
-  :LBRACKET => 19,
-  :RBRACKET => 20,
-  :QUERY => 21,
-  :STAR => 22,
-  :LESS => 23,
-  :GREATER => 24,
-  :EOF => 25 }
-
-racc_nt_base = 26
+  :HASH_TYPE => 5,
+  :HASH_QUERY => 6,
+  :CONST_BEGIN => 7,
+  :RASSOC => 8,
+  :FIXNUM => 9,
+  :FLOAT => 10,
+  :COLON => 11,
+  :DOT => 12,
+  :DOTS => 13,
+  :ID => 14,
+  :SYMBOL => 15,
+  :SPECIAL_ID => 16,
+  :STRING => 17,
+  :LPAREN => 18,
+  :RPAREN => 19,
+  :LBRACE => 20,
+  :RBRACE => 21,
+  :LBRACKET => 22,
+  :RBRACKET => 23,
+  :QUERY => 24,
+  :STAR => 25,
+  :LESS => 26,
+  :GREATER => 27,
+  :EOF => 28 }
+
+racc_nt_base = 29
 
 racc_use_result_var = true
 
@@ -234,12 +251,15 @@ Racc_token_to_s_table = [
   "COMMA",
   "RARROW",
   "OR",
-  "DOUBLE_HASH",
+  "HASH_TYPE",
+  "HASH_QUERY",
   "CONST_BEGIN",
   "RASSOC",
   "FIXNUM",
   "FLOAT",
   "COLON",
+  "DOT",
+  "DOTS",
   "ID",
   "SYMBOL",
   "SPECIAL_ID",
@@ -259,6 +279,7 @@ Racc_token_to_s_table = [
   "entry",
   "method_type",
   "bare_type",
+  "query_type",
   "type_expr",
   "arg_list",
   "block",
@@ -295,276 +316,296 @@ module_eval(<<'.,.,', 'parser.racc', 19)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 23)
+module_eval(<<'.,.,', 'parser.racc', 20)
   def _reduce_3(val, _values, result)
-            result = val[1]
-      
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 28)
+module_eval(<<'.,.,', 'parser.racc', 23)
   def _reduce_4(val, _values, result)
-            result = RDL::Type::MethodType.new val[1], val[3], val[5]
-      
+     result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 31)
+module_eval(<<'.,.,', 'parser.racc', 26)
   def _reduce_5(val, _values, result)
-            result = RDL::Type::MethodType.new val[1], val[3], RDL::Type::AnnotatedArgType.new(val[6], val[5])
-      
+     result = RDL::Type::MethodType.new val[1].args, val[1].block, val[1].ret 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 35)
+module_eval(<<'.,.,', 'parser.racc', 30)
   def _reduce_6(val, _values, result)
-     result = [val[0].to_sym, val[2]] 
+            result = RDL::Type::MethodType.new val[1], val[3], val[5]
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 36)
+module_eval(<<'.,.,', 'parser.racc', 33)
   def _reduce_7(val, _values, result)
-     result = [val[0].to_sym, val[2]] + val[4] 
+            result = RDL::Type::MethodType.new val[1], val[3], RDL::Type::AnnotatedArgType.new(val[6], val[5])
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 39)
+module_eval(<<'.,.,', 'parser.racc', 37)
   def _reduce_8(val, _values, result)
-     result = [] 
+     result = [val[0].to_sym, val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 40)
+module_eval(<<'.,.,', 'parser.racc', 38)
   def _reduce_9(val, _values, result)
-     result = val[0] 
+     result = [val[0].to_sym, val[2]] + val[4] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 42)
+module_eval(<<'.,.,', 'parser.racc', 41)
   def _reduce_10(val, _values, result)
-          result = [RDL::Type::FiniteHashType.new(Hash[*val[0]])]
-      
+     result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 45)
+module_eval(<<'.,.,', 'parser.racc', 42)
   def _reduce_11(val, _values, result)
-     result = [val[0]] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 46)
+module_eval(<<'.,.,', 'parser.racc', 44)
   def _reduce_12(val, _values, result)
-     result = val[2].unshift val[0] 
+          result = [RDL::Type::FiniteHashType.new(Hash[*val[0]])]
+      
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.racc', 47)
   def _reduce_13(val, _values, result)
-     # named arg list must come last
-      result = [val[0], RDL::Type::FiniteHashType.new(Hash[*val[2]])]
-      
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 51)
+module_eval(<<'.,.,', 'parser.racc', 48)
   def _reduce_14(val, _values, result)
-     result = val[0] 
+     result = val[2].unshift val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 52)
+module_eval(<<'.,.,', 'parser.racc', 49)
   def _reduce_15(val, _values, result)
-     result = RDL::Type::AnnotatedArgType.new(val[1], val[0]) 
+     # named arg list must come last
+      result = [val[0], RDL::Type::FiniteHashType.new(Hash[*val[2]])]
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 54)
+module_eval(<<'.,.,', 'parser.racc', 53)
   def _reduce_16(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 55)
+module_eval(<<'.,.,', 'parser.racc', 54)
   def _reduce_17(val, _values, result)
-     result = val[0] + val[2] 
+     result = RDL::Type::AnnotatedArgType.new(val[1], val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 57)
+module_eval(<<'.,.,', 'parser.racc', 55)
   def _reduce_18(val, _values, result)
-     result = [val[0].to_sym, val[2]] 
+     result = RDL::Type::DotsQuery.new 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 60)
+module_eval(<<'.,.,', 'parser.racc', 57)
   def _reduce_19(val, _values, result)
-     result = RDL::Type::OptionalType.new val[1] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 61)
+module_eval(<<'.,.,', 'parser.racc', 58)
   def _reduce_20(val, _values, result)
-     result = RDL::Type::VarargType.new val[1] 
+     result = val[0] + val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 62)
+module_eval(<<'.,.,', 'parser.racc', 60)
   def _reduce_21(val, _values, result)
-     result = val[0] 
+     result = [val[0].to_sym, val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 64)
+module_eval(<<'.,.,', 'parser.racc', 63)
   def _reduce_22(val, _values, result)
      result = RDL::Type::OptionalType.new val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 65)
+module_eval(<<'.,.,', 'parser.racc', 64)
   def _reduce_23(val, _values, result)
-     result = val[0] 
+     result = RDL::Type::VarargType.new val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 68)
+module_eval(<<'.,.,', 'parser.racc', 65)
   def _reduce_24(val, _values, result)
-     result = nil 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 69)
+module_eval(<<'.,.,', 'parser.racc', 67)
   def _reduce_25(val, _values, result)
-     result = val[1] 
+     result = RDL::Type::OptionalType.new val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 72)
+module_eval(<<'.,.,', 'parser.racc', 68)
   def _reduce_26(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 73)
+module_eval(<<'.,.,', 'parser.racc', 71)
   def _reduce_27(val, _values, result)
+     result = nil 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 72)
+  def _reduce_28(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
+module_eval(<<'.,.,', 'parser.racc', 75)
+  def _reduce_29(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
 module_eval(<<'.,.,', 'parser.racc', 76)
-  def _reduce_28(val, _values, result)
+  def _reduce_30(val, _values, result)
+     result = val[1] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 79)
+  def _reduce_31(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 77)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 80)
+  def _reduce_32(val, _values, result)
      result = [val[0]] + val[2] 
     result
   end
 .,.,
 
-# reduce 30 omitted
+# reduce 33 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 80)
-  def _reduce_31(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 83)
+  def _reduce_34(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 81)
-  def _reduce_32(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 84)
+  def _reduce_35(val, _values, result)
      result = [val[0].to_i, val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 82)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 85)
+  def _reduce_36(val, _values, result)
      result = [val[0].to_f, val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 84)
-  def _reduce_34(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 87)
+  def _reduce_37(val, _values, result)
         result = [Kernel.const_get(val[0]), val[2]]
   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 86)
-  def _reduce_35(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 89)
+  def _reduce_38(val, _values, result)
      result = [val[0], val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 89)
-  def _reduce_36(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 92)
+  def _reduce_39(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 90)
-  def _reduce_37(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 93)
+  def _reduce_40(val, _values, result)
      result = val[0] + val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 93)
-  def _reduce_38(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 96)
+  def _reduce_41(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 94)
-  def _reduce_39(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 97)
+  def _reduce_42(val, _values, result)
      result = RDL::Type::UnionType.new val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 97)
-  def _reduce_40(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 100)
+  def _reduce_43(val, _values, result)
      result = RDL::Type::SingletonType.new(val[0].to_sym) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 99)
-  def _reduce_41(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 102)
+  def _reduce_44(val, _values, result)
           if val[0] == 'nil' then
         result = RDL::Type::NilType.new
       elsif val[0] =~ /^[a-z_]+\w*\'?/ then
@@ -577,8 +618,8 @@ module_eval(<<'.,.,', 'parser.racc', 99)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 108)
-  def _reduce_42(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 111)
+  def _reduce_45(val, _values, result)
           if $__rdl_special_types.has_key? val[0] then
         result = $__rdl_special_types[val[0]]
       else
@@ -589,8 +630,8 @@ module_eval(<<'.,.,', 'parser.racc', 108)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 115)
-  def _reduce_43(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 118)
+  def _reduce_46(val, _values, result)
           n = RDL::Type::NominalType.new(val[0])
       result = RDL::Type::GenericType.new(n, *val[2])
     
@@ -598,52 +639,59 @@ module_eval(<<'.,.,', 'parser.racc', 115)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 119)
-  def _reduce_44(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 122)
+  def _reduce_47(val, _values, result)
           result = RDL::Type::TupleType.new(*val[1])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 122)
-  def _reduce_45(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 125)
+  def _reduce_48(val, _values, result)
           result = RDL::Type::StructuralType.new(Hash[*val[1]])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 125)
-  def _reduce_46(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 128)
+  def _reduce_49(val, _values, result)
           result = RDL::Type::FiniteHashType.new(Hash[*val[1]])
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 127)
-  def _reduce_47(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 130)
+  def _reduce_50(val, _values, result)
      result = RDL::Type::SingletonType.new(val[0].to_i) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 128)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 131)
+  def _reduce_51(val, _values, result)
      result = RDL::Type::SingletonType.new(val[0].to_f) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 130)
-  def _reduce_49(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 133)
+  def _reduce_52(val, _values, result)
           result =  RDL::Type::SingletonType.new(Kernel.const_get(val[1]))
     
     result
   end
 .,.,
 
+module_eval(<<'.,.,', 'parser.racc', 137)
+  def _reduce_53(val, _values, result)
+     result = RDL::Type::WildQuery.new 
+    result
+  end
+.,.,
+
 def _reduce_none(val, _values, result)
   val[0]
 end