rdl 1.1.1 → 2.0.0.rc1

data/lib/rdl/types/nominal.rb

@@ -1,5 +1,3 @@
-require_relative 'type'
-
 module RDL::Type
   class NominalType < Type
     attr_reader :name # string
@@ -12,7 +10,6 @@ module RDL::Type
 
     def self.new(name)
       name = name.to_s
-      return NilType.new if name == "NilClass"
       t = @@cache[name]
       return t if t
       t = self.__new__ name
@@ -23,15 +20,16 @@ module RDL::Type
       @name = name
     end
 
-    def eql?(other)
-      self == other
-    end
-
     def ==(other)
+      return false if other.nil?
+      other = other.canonical
       return (other.instance_of? self.class) && (other.name == @name)
     end
 
+    alias eql? ==
+
     def match(other)
+      other = other.canonical
       other = other.type if other.instance_of? AnnotatedArgType
       return true if other.instance_of? WildQuery
       return self == other
@@ -51,25 +49,28 @@ module RDL::Type
     end
 
     def <=(other)
+      other = other.canonical
       k = klass
-      return true if other.instance_of? TopType
-      return k.ancestors.member?(other.klass) if other.instance_of? NominalType
+      if other.instance_of? TopType
+        return true
+      elsif other.instance_of? NominalType
+        return k.ancestors.member?(other.klass)
 #      return self <= other.base if other.instance_of? GenericType # raw subtyping not allowed
-      if other.instance_of? StructuralType
+      elsif other.instance_of? StructuralType
         # similar logic in GenericType
         other.methods.each_pair { |m, t|
           return false unless k.method_defined? m
-          if RDL::Wrap.has_contracts?(k, m, :type)
-            types = RDL::Wrap.get_contracts(k, m, :type)
+          types = $__rdl_info.get(k, m, :type)
+          if types
             return false unless types.all? { |t_self| t_self <= t }
           end
         }
         return true
+      elsif other.instance_of? UnionType
+        return other.types.any? { |ot| self <= ot }
+      else
+        return false
       end
-      if other.instance_of? UnionType
-        other.types.each {|ot| return true if self <= ot}
-      end
-      return false
     end
 
     def member?(obj, *args)
@@ -82,5 +83,10 @@ module RDL::Type
     def instantiate(inst)
       return self
     end
+
+    @@cache.merge!({"NilClass" => SingletonType.new(nil),
+                    "TrueClass" => SingletonType.new(true),
+                    "FalseClass" => SingletonType.new(false),
+                    })
   end
 end

data/lib/rdl/types/optional.rb

@@ -1,26 +1,11 @@
-require_relative 'type'
-
 module RDL::Type
   class OptionalType < Type
     attr_reader :type
 
-    @@cache = {}
-
-    class << self
-      alias :__new__ :new
-    end
-
-    def self.new(type)
-      t = @@cache[type]
-      return t if t
-      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
-
     def initialize(type)
-      raise "Can't have optional optional type" if type.class == OptionalType
-      raise "Can't have optional vararg type" if type.class == VarargType
+      raise RuntimeError, "Attempt to create optional type with non-type" unless type.is_a? Type
+      raise "Can't have optional optional type" if type.is_a? OptionalType
+      raise "Can't have optional vararg type" if type.is_a? VarargType
       @type = type
       super()
     end
@@ -33,15 +18,16 @@ module RDL::Type
       end
     end
 
-    def eql?(other)
-      self == other
-    end
-
     def ==(other) # :nodoc:
+      return false if other.nil?
+      other = other.canonical
       return (other.instance_of? OptionalType) && (other.type == @type)
     end
 
+    alias eql? ==
+
     def match(other)
+      other = other.canonical
       other = other.type if other.instance_of? AnnotatedArgType
       return true if other.instance_of? WildQuery
       return (other.instance_of? OptionalType) && (@type.match(other.type))

data/lib/rdl/types/parser.racc

@@ -105,7 +105,11 @@ rule
       SYMBOL { result = RDL::Type::SingletonType.new(val[0].to_sym) }
     | ID {
       if val[0] == 'nil' then
-        result = RDL::Type::NilType.new
+        result = $__rdl_nil_type
+      elsif val[0] == 'true' then
+        result = $__rdl_true_type
+      elsif val[0] == 'false'
+        result = $__rdl_false_type
       elsif val[0] =~ /^[a-z_]+\w*\'?/ then
         result = RDL::Type::VarType.new(val[0].to_sym)
       else
@@ -130,6 +134,9 @@ rule
     | LBRACKET method_sig_list RBRACKET {
       result = RDL::Type::StructuralType.new(Hash[*val[1]])
     }
+    | LBRACKET RBRACKET {
+      result = RDL::Type::TupleType.new
+    }
     | LBRACE hash_expr_comma_list RBRACE {
       result = RDL::Type::FiniteHashType.new(Hash[*val[1]])
     }
@@ -144,8 +151,6 @@ rule
 
 ---- header ----
 
-require_relative 'lexer.rex'
-
 module RDL::Type
 
 ---- inner ----

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

@@ -1,19 +1,17 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
 require 'racc/parser.rb'
 
 
-require_relative 'lexer.rex'
-
 module RDL::Type
 
 class Parser < Racc::Parser
 
-module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 152)
+module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 157)
 
 def initialize()
   @yydebug = true
@@ -23,112 +21,114 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    20,    69,    18,    19,    56,    21,    28,    30,    13,    15,
-     5,     6,    11,    62,    16,    56,    17,    37,    31,    32,
-    20,    63,    18,    19,     7,    21,    28,    30,    13,    15,
-    64,    37,    11,    65,    16,    66,    17,    67,    31,    32,
-    20,    68,    18,    19,    59,    21,    70,    14,    13,    15,
-    71,    72,    11,    73,    16,    75,    17,    20,    81,    18,
-    19,    55,    21,    78,    14,    13,    15,    20,    38,    18,
-    19,    16,    21,    17,    14,    13,    15,    54,    83,    11,
-    53,    16,    20,    17,    18,    19,    52,    21,    86,    14,
-    13,    15,    51,    37,    11,     7,    16,    20,    17,    18,
-    19,    36,    21,    91,    14,    13,    15,     7,    34,    11,
-    94,    16,    20,    17,    18,    19,    95,    21,     7,    14,
-    13,    15,    97,     8,    11,    99,    16,    20,    17,    18,
-    19,   101,    21,    69,    14,    13,    15,   102,   nil,    11,
-   nil,    16,    20,    17,    18,    19,   nil,    21,   nil,    14,
-    13,    15,   nil,   nil,    11,   nil,    16,    20,    17,    18,
-    19,   nil,    21,   nil,    14,    13,    15,    20,   nil,    18,
-    19,    16,    21,    17,    14,    13,    15,    20,   nil,    18,
-    19,    16,    21,    17,    14,    13,    15,    20,   nil,    18,
-    19,    16,    21,    17,    14,    13,    15,   nil,   nil,    11,
-   nil,    16,    20,    17,    18,    19,   nil,    21,   nil,    14,
-    13,    15,    20,   nil,    18,    19,    16,    21,    17,    14,
-    13,    15,   nil,   nil,    11,   nil,    16,    20,    17,    18,
-    19,   nil,    21,   nil,    47,    13,    15,   nil,   nil,    11,
-   nil,    16,    42,    17,    40,    41,   nil,   nil,    42,    38,
-    40,    41,    43,   nil,     7,    38,   nil,   nil,    43 ]
+    20,    70,    18,    19,    73,    21,    28,    30,    13,    15,
+     5,     6,    11,    74,    16,    57,    17,    37,    31,    32,
+    20,    76,    18,    19,     7,    21,    28,    30,    13,    15,
+    79,    37,    11,    38,    16,    84,    17,    87,    31,    32,
+    20,     7,    18,    19,    92,    21,     7,    14,    13,    15,
+    95,    96,    11,    98,    16,   100,    17,    20,    82,    18,
+    19,   102,    21,    70,    47,    13,    15,   103,     8,    11,
+     7,    16,    34,    17,    51,    20,    36,    18,    19,    37,
+    21,    52,    14,    13,    15,    53,    54,    11,    55,    16,
+    20,    17,    18,    19,    56,    21,    60,    14,    13,    15,
+    20,    57,    18,    19,    16,    21,    17,    14,    13,    15,
+    63,    64,    11,    65,    16,    20,    17,    18,    19,    66,
+    21,    67,    14,    13,    15,    68,    69,    11,    71,    16,
+    20,    17,    18,    19,    72,    21,   nil,    14,    13,    15,
+    20,   nil,    18,    19,    16,    21,    17,    14,    13,    15,
+   nil,   nil,    11,   nil,    16,    20,    17,    18,    19,   nil,
+    21,   nil,    14,    13,    15,   nil,   nil,    11,   nil,    16,
+    20,    17,    18,    19,   nil,    21,   nil,    14,    13,    15,
+   nil,   nil,    11,   nil,    16,    20,    17,    18,    19,   nil,
+    21,   nil,    14,    13,    15,   nil,   nil,    11,   nil,    16,
+    20,    17,    18,    19,   nil,    21,   nil,    14,    13,    15,
+    20,   nil,    18,    19,    16,    21,    17,    14,    13,    15,
+   nil,   nil,    11,   nil,    16,    20,    17,    18,    19,   nil,
+    21,   nil,    14,    13,    15,    20,   nil,    18,    19,    16,
+    21,    17,    14,    13,    15,    42,   nil,    40,    41,    16,
+   nil,    17,    38,   nil,   nil,    43,    42,     7,    40,    41,
+   nil,   nil,   nil,    38,   nil,   nil,    43 ]
 
 racc_action_check = [
-     7,    47,     7,     7,    38,     7,     7,     7,     7,     7,
-     0,     0,     7,    40,     7,    30,     7,    47,     7,     7,
-    53,    41,    53,    53,     0,    53,    53,    53,    53,    53,
-    42,    30,    53,    43,    53,    44,    53,    45,    53,    53,
-    56,    46,    56,    56,    35,    56,    48,    56,    56,    56,
-    49,    50,    56,    51,    56,    52,    56,    36,    56,    36,
-    36,    29,    36,    54,    36,    36,    36,    81,    55,    81,
-    81,    36,    81,    36,    81,    81,    81,    27,    61,    81,
-    26,    81,    11,    81,    11,    11,    23,    11,    64,    11,
-    11,    11,    20,    14,    11,    69,    11,    70,    11,    70,
-    70,    12,    70,    74,    70,    70,    70,    75,     8,    70,
-    86,    70,    37,    70,    37,    37,    89,    37,     6,    37,
-    37,    37,    92,     1,    37,    95,    37,    91,    37,    91,
-    91,    96,    91,    99,    91,    91,    91,   101,   nil,    91,
-   nil,    91,    32,    91,    32,    32,   nil,    32,   nil,    32,
-    32,    32,   nil,   nil,    32,   nil,    32,    65,    32,    65,
-    65,   nil,    65,   nil,    65,    65,    65,    63,   nil,    63,
-    63,    65,    63,    65,    63,    63,    63,    62,   nil,    62,
-    62,    63,    62,    63,    62,    62,    62,     5,   nil,     5,
-     5,    62,     5,    62,     5,     5,     5,   nil,   nil,     5,
-   nil,     5,    94,     5,    94,    94,   nil,    94,   nil,    94,
-    94,    94,    31,   nil,    31,    31,    94,    31,    94,    31,
-    31,    31,   nil,   nil,    31,   nil,    31,    17,    31,    17,
-    17,   nil,    17,   nil,    17,    17,    17,   nil,   nil,    17,
-   nil,    17,    16,    17,    16,    16,   nil,   nil,    66,    16,
-    66,    66,    16,   nil,    16,    66,   nil,   nil,    66 ]
+     7,    47,     7,     7,    50,     7,     7,     7,     7,     7,
+     0,     0,     7,    52,     7,    30,     7,    47,     7,     7,
+    54,    53,    54,    54,     0,    54,    54,    54,    54,    54,
+    55,    30,    54,    56,    54,    62,    54,    65,    54,    54,
+    57,    70,    57,    57,    75,    57,    76,    57,    57,    57,
+    87,    90,    57,    93,    57,    96,    57,    17,    57,    17,
+    17,    97,    17,   100,    17,    17,    17,   102,     1,    17,
+     6,    17,     8,    17,    17,    32,    12,    32,    32,    14,
+    32,    20,    32,    32,    32,    23,    26,    32,    27,    32,
+    66,    32,    66,    66,    29,    66,    35,    66,    66,    66,
+    11,    38,    11,    11,    66,    11,    66,    11,    11,    11,
+    40,    41,    11,    42,    11,    71,    11,    71,    71,    43,
+    71,    44,    71,    71,    71,    45,    46,    71,    48,    71,
+    36,    71,    36,    36,    49,    36,   nil,    36,    36,    36,
+    82,   nil,    82,    82,    36,    82,    36,    82,    82,    82,
+   nil,   nil,    82,   nil,    82,    37,    82,    37,    37,   nil,
+    37,   nil,    37,    37,    37,   nil,   nil,    37,   nil,    37,
+    92,    37,    92,    92,   nil,    92,   nil,    92,    92,    92,
+   nil,   nil,    92,   nil,    92,     5,    92,     5,     5,   nil,
+     5,   nil,     5,     5,     5,   nil,   nil,     5,   nil,     5,
+    95,     5,    95,    95,   nil,    95,   nil,    95,    95,    95,
+    31,   nil,    31,    31,    95,    31,    95,    31,    31,    31,
+   nil,   nil,    31,   nil,    31,    63,    31,    63,    63,   nil,
+    63,   nil,    63,    63,    63,    64,   nil,    64,    64,    63,
+    64,    63,    64,    64,    64,    16,   nil,    16,    16,    64,
+   nil,    64,    16,   nil,   nil,    16,    67,    16,    67,    67,
+   nil,   nil,   nil,    67,   nil,   nil,    67 ]
 
 racc_action_pointer = [
-     5,   123,   nil,   nil,   nil,   180,    99,    -7,   108,   nil,
-   nil,    75,    97,   nil,    66,   nil,   235,   220,   nil,   nil,
-    78,   nil,   nil,    66,   nil,   nil,    78,    63,   nil,    59,
-     4,   205,   135,   nil,   nil,    24,    50,   105,    -7,   nil,
-     5,    13,    16,    25,    33,    15,    19,   -10,    44,    26,
-    27,    31,    34,    13,    45,    54,    33,   nil,   nil,   nil,
-   nil,    50,   170,   160,    66,   150,   241,   nil,   nil,    76,
-    90,   nil,   nil,   nil,   100,    88,   nil,   nil,   nil,   nil,
-   nil,    60,   nil,   nil,   nil,   nil,   102,   nil,   nil,   114,
-   nil,   120,   100,   nil,   195,   111,   117,   nil,   nil,   122,
-   nil,   119,   nil ]
+     5,    68,   nil,   nil,   nil,   178,    51,    -7,    72,   nil,
+   nil,    93,    72,   nil,    52,   nil,   238,    50,   nil,   nil,
+    67,   nil,   nil,    65,   nil,   nil,    84,    74,   nil,    92,
+     4,   203,    68,   nil,   nil,    76,   123,   148,    90,   nil,
+   102,   103,    99,   111,   119,   103,   104,   -10,   126,   110,
+   -20,   nil,    -9,     0,    13,    12,    19,    33,   nil,   nil,
+   nil,   nil,     7,   218,   228,    15,    83,   249,   nil,   nil,
+    22,   108,   nil,   nil,   nil,    41,    27,   nil,   nil,   nil,
+   nil,   nil,   133,   nil,   nil,   nil,   nil,    42,   nil,   nil,
+    49,   nil,   163,    31,   nil,   193,    41,    47,   nil,   nil,
+    52,   nil,    49,   nil ]
 
 racc_action_default = [
-   -57,   -57,    -1,    -2,    -3,   -57,   -57,   -11,   -57,    -4,
-   -31,   -57,   -43,   -45,   -46,   -47,   -35,   -57,   -53,   -54,
-   -57,   -56,    -5,   -57,   -12,   -13,   -14,   -17,   -20,   -21,
-   -46,   -57,   -57,   -26,   103,   -57,   -57,   -57,   -57,   -36,
-   -57,   -57,   -57,   -57,   -41,   -57,   -57,   -46,   -33,   -57,
-   -57,   -57,   -29,   -57,   -19,   -57,   -57,   -24,   -25,   -32,
-   -44,   -57,   -57,   -57,   -57,   -57,   -35,   -49,   -52,   -57,
-   -57,   -50,   -51,   -55,   -57,   -57,   -15,   -16,   -18,   -22,
-   -23,   -57,   -28,   -48,   -37,   -38,   -57,   -40,   -42,    -9,
-   -34,   -57,   -57,   -27,   -57,   -57,    -6,   -30,   -39,   -57,
-   -10,    -7,    -8 ]
+   -58,   -58,    -1,    -2,    -3,   -58,   -58,   -11,   -58,    -4,
+   -31,   -58,   -43,   -45,   -46,   -47,   -35,   -58,   -54,   -55,
+   -58,   -57,    -5,   -58,   -12,   -13,   -14,   -17,   -20,   -21,
+   -46,   -58,   -58,   -26,   104,   -58,   -58,   -58,   -58,   -36,
+   -58,   -58,   -58,   -58,   -41,   -58,   -58,   -46,   -33,   -58,
+   -58,   -52,   -58,   -29,   -58,   -19,   -58,   -58,   -24,   -25,
+   -32,   -44,   -58,   -58,   -58,   -58,   -58,   -35,   -49,   -53,
+   -58,   -58,   -50,   -51,   -56,   -58,   -58,   -15,   -16,   -18,
+   -22,   -23,   -58,   -28,   -48,   -37,   -38,   -58,   -40,   -42,
+    -9,   -34,   -58,   -58,   -27,   -58,   -58,    -6,   -30,   -39,
+   -58,   -10,    -7,    -8 ]
 
 racc_goto_table = [
-     9,    50,    33,     2,    60,    49,    35,    39,    25,    22,
-    46,    80,    23,    24,    74,     4,     3,     1,   nil,    45,
-   nil,   nil,   nil,   nil,   nil,    61,    57,    58,   nil,   nil,
-    84,    85,   nil,    87,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,   nil,
-   nil,    82,   nil,   nil,    77,   nil,    79,    39,    90,    76,
-    88,   nil,    98,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    89,   nil,   nil,   nil,    93,   nil,    92,   100,
-   nil,   nil,   nil,   nil,   nil,   nil,    96 ]
+     9,    50,    33,     2,    61,    49,    35,    46,    25,    22,
+    39,    81,     4,    24,     3,    23,    75,     1,   nil,    45,
+   nil,   nil,   nil,   nil,   nil,    62,    58,    59,   nil,   nil,
+   nil,    85,    86,   nil,    88,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,
+   nil,   nil,    83,   nil,   nil,    78,   nil,    80,    89,    91,
+    77,    39,   nil,    99,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    90,   nil,   nil,   nil,    94,   nil,    93,
+   101,   nil,   nil,   nil,   nil,   nil,   nil,    97 ]
 
 racc_goto_check = [
-     5,     8,     5,     2,    15,    16,     5,    13,    10,     2,
-    18,    14,     6,     9,     7,     4,     3,     1,   nil,     2,
+     5,     8,     5,     2,    15,    16,     5,    18,    10,     2,
+    13,    14,     4,     9,     3,     6,     7,     1,   nil,     2,
    nil,   nil,   nil,   nil,   nil,    16,     5,     5,   nil,   nil,
-    15,    15,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,   nil,
-   nil,     5,   nil,   nil,    10,   nil,    10,    13,    16,     9,
-    18,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     2,   nil,   nil,   nil,     5,   nil,     2,     8,
-   nil,   nil,   nil,   nil,   nil,   nil,     5 ]
+   nil,    15,    15,   nil,    15,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,
+   nil,   nil,     5,   nil,   nil,    10,   nil,    10,    18,    16,
+     9,    13,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     2,   nil,   nil,   nil,     5,   nil,     2,
+     8,   nil,   nil,   nil,   nil,   nil,   nil,     5 ]
 
 racc_goto_pointer = [
-   nil,    17,     3,    16,    15,    -5,     5,   -38,   -16,     6,
-     1,   nil,   nil,    -9,   -45,   -32,   -12,   nil,    -6,   nil ]
+   nil,    17,     3,    14,    12,    -5,     8,   -37,   -16,     6,
+     1,   nil,   nil,    -6,   -46,   -32,   -12,   nil,    -9,   nil ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,   nil,
@@ -187,15 +187,16 @@ racc_reduce_table = [
   3, 49, :_reduce_49,
   3, 49, :_reduce_50,
   3, 49, :_reduce_51,
-  3, 49, :_reduce_52,
-  1, 49, :_reduce_53,
+  2, 49, :_reduce_52,
+  3, 49, :_reduce_53,
   1, 49, :_reduce_54,
-  3, 49, :_reduce_55,
-  1, 49, :_reduce_56 ]
+  1, 49, :_reduce_55,
+  3, 49, :_reduce_56,
+  1, 49, :_reduce_57 ]
 
-racc_reduce_n = 57
+racc_reduce_n = 58
 
-racc_shift_n = 103
+racc_shift_n = 104
 
 racc_token_table = {
   false => 0,
@@ -627,7 +628,11 @@ module_eval(<<'.,.,', 'parser.racc', 104)
 module_eval(<<'.,.,', 'parser.racc', 106)
   def _reduce_46(val, _values, result)
           if val[0] == 'nil' then
-        result = RDL::Type::NilType.new
+        result = $__rdl_nil_type
+      elsif val[0] == 'true' then
+        result = $__rdl_true_type
+      elsif val[0] == 'false'
+        result = $__rdl_false_type
       elsif val[0] =~ /^[a-z_]+\w*\'?/ then
         result = RDL::Type::VarType.new(val[0].to_sym)
       else
@@ -638,7 +643,7 @@ module_eval(<<'.,.,', 'parser.racc', 106)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 115)
+module_eval(<<'.,.,', 'parser.racc', 119)
   def _reduce_47(val, _values, result)
           if $__rdl_special_types.has_key? val[0] then
         result = $__rdl_special_types[val[0]]
@@ -650,7 +655,7 @@ module_eval(<<'.,.,', 'parser.racc', 115)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 122)
+module_eval(<<'.,.,', 'parser.racc', 126)
   def _reduce_48(val, _values, result)
           n = RDL::Type::NominalType.new(val[0])
       result = RDL::Type::GenericType.new(n, *val[2])
@@ -659,14 +664,14 @@ module_eval(<<'.,.,', 'parser.racc', 122)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 125)
+module_eval(<<'.,.,', 'parser.racc', 129)
   def _reduce_49(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 127)
+module_eval(<<'.,.,', 'parser.racc', 131)
   def _reduce_50(val, _values, result)
           result = RDL::Type::TupleType.new(*val[1])
     
@@ -674,7 +679,7 @@ module_eval(<<'.,.,', 'parser.racc', 127)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 130)
+module_eval(<<'.,.,', 'parser.racc', 134)
   def _reduce_51(val, _values, result)
           result = RDL::Type::StructuralType.new(Hash[*val[1]])
     
@@ -682,38 +687,46 @@ module_eval(<<'.,.,', 'parser.racc', 130)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 133)
+module_eval(<<'.,.,', 'parser.racc', 137)
   def _reduce_52(val, _values, result)
-          result = RDL::Type::FiniteHashType.new(Hash[*val[1]])
+          result = RDL::Type::TupleType.new
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 135)
+module_eval(<<'.,.,', 'parser.racc', 140)
   def _reduce_53(val, _values, result)
-     result = RDL::Type::SingletonType.new(val[0].to_i) 
+          result = RDL::Type::FiniteHashType.new(Hash[*val[1]])
+    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 136)
+module_eval(<<'.,.,', 'parser.racc', 142)
   def _reduce_54(val, _values, result)
-     result = RDL::Type::SingletonType.new(val[0].to_f) 
+     result = RDL::Type::SingletonType.new(val[0].to_i) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 138)
+module_eval(<<'.,.,', 'parser.racc', 143)
   def _reduce_55(val, _values, result)
+     result = RDL::Type::SingletonType.new(val[0].to_f) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.racc', 145)
+  def _reduce_56(val, _values, result)
           result =  RDL::Type::SingletonType.new(Kernel.const_get(val[1]))
     
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 142)
-  def _reduce_56(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 149)
+  def _reduce_57(val, _values, result)
      result = RDL::Type::WildQuery.new 
     result
   end