dbc 1.2.0 → 1.2.1

data/lib/dbc/define.rb

@@ -16,7 +16,7 @@ module Preprocessor
 
   class Define < Racc::Parser
 
-module_eval <<'..end src/define.y modeval..idb514c9ea90', 'src/define.y', 75
+module_eval <<'..end src/define.y modeval..id2247533106', 'src/define.y', 75
 
 	def initialize(params, tokens)
 		if params and not params.class == Parameters
@@ -87,7 +87,7 @@ protected
 		@q.shift
 	end
 
-..end src/define.y modeval..idb514c9ea90
+..end src/define.y modeval..id2247533106
 
 ##### racc 1.4.4 generates ###
 

data/lib/dbc/ocl.rb

@@ -23,7 +23,7 @@ module OCL
 	
 		def initialize(message, file, line)
 			@message = message
-			if message =~ /\n\r"/
+			if message =~ /[\n\r"]/
 				raise ParseError, "label '#{message}' contains invalid characters: '\\n', '\\r', or '\"'"
 			end
 			@file = file
@@ -413,7 +413,7 @@ module OCL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end src/ocl.y modeval..id1a6a4371db', 'src/ocl.y', 849
+module_eval <<'..end src/ocl.y modeval..id459cfd0b09', 'src/ocl.y', 849
 
 	def Parser.reserved_word?(str)
 		str =~ /\A(?:context|forall|exists|in|and|or|implies|not|xor)\Z/
@@ -511,7 +511,7 @@ protected
 		t
 	end
 
-..end src/ocl.y modeval..id1a6a4371db
+..end src/ocl.y modeval..id459cfd0b09
 
 ##### racc 1.4.4 generates ###
 

data/lib/dbc/parameters.rb

@@ -72,7 +72,7 @@ module Preprocessor
 
   class ArgumentParser < Racc::Parser
 
-module_eval <<'..end src/parameters.y modeval..id439c3f7619', 'src/parameters.y', 144
+module_eval <<'..end src/parameters.y modeval..id1ab45e1c83', 'src/parameters.y', 144
 
 	def ArgumentParser.parse(tokens)
 		self.new.parse(tokens)
@@ -103,7 +103,7 @@ protected
 		end # case
 	end
 
-..end src/parameters.y modeval..id439c3f7619
+..end src/parameters.y modeval..id1ab45e1c83
 
 ##### racc 1.4.4 generates ###
 

data/lib/dbc/parseerrorhandler.rb

@@ -7,7 +7,7 @@ module ParseErrorHandler
 	def on_error(error_token_id, error_value, value_stack)
 		token_name = token_to_str(error_token_id)
 		token_name.downcase!
-		token = error_value.inspect
+		token = error_value.to_s.inspect
 
 		str = 'parse error '
 		#if value_stack.length > 0

data/lib/dbc/preprocessor.rb

@@ -265,8 +265,10 @@ protected
 					#	raise "impossible"
 				end # case
 
-				# eat rest of line
-				until @source.empty? or @source.shift[0] == :NEWLINE; end
+				# eat rest of line unless token is a newline
+				until result[0] == :NEWLINE or @source.empty?
+					result = @source.shift
+				end
 
 			end #if
 			@in_statement = false
@@ -281,7 +283,7 @@ module Preprocessor
 
   class StatementParser < Racc::Parser
 
-module_eval <<'..end src/preprocessor.y modeval..id5b6688d454', 'src/preprocessor.y', 705
+module_eval <<'..end src/preprocessor.y modeval..id895fa9d1fa', 'src/preprocessor.y', 708
 
 	include Resolve
 
@@ -412,7 +414,7 @@ protected
 		t
 	end
 
-..end src/preprocessor.y modeval..id5b6688d454
+..end src/preprocessor.y modeval..id895fa9d1fa
 
 ##### racc 1.4.4 generates ###
 
@@ -433,15 +435,16 @@ racc_reduce_table = [
  1, 68, :_reduce_none,
  1, 68, :_reduce_none,
  1, 68, :_reduce_15,
+ 1, 68, :_reduce_16,
  1, 69, :_reduce_none,
- 1, 69, :_reduce_17,
  1, 69, :_reduce_18,
+ 1, 69, :_reduce_19,
  1, 69, :_reduce_none,
- 1, 69, :_reduce_20,
- 1, 70, :_reduce_21,
- 1, 70, :_reduce_22,
+ 1, 69, :_reduce_21,
+ 1, 69, :_reduce_22,
  1, 70, :_reduce_23,
- 1, 73, :_reduce_none,
+ 1, 70, :_reduce_24,
+ 1, 70, :_reduce_25,
  1, 73, :_reduce_none,
  1, 73, :_reduce_none,
  1, 73, :_reduce_none,
@@ -457,52 +460,52 @@ racc_reduce_table = [
  1, 64, :_reduce_none,
  1, 64, :_reduce_none,
  1, 64, :_reduce_none,
- 1, 64, :_reduce_40,
  1, 64, :_reduce_41,
- 2, 76, :_reduce_42,
+ 1, 64, :_reduce_42,
  2, 76, :_reduce_43,
- 2, 75, :_reduce_44,
- 2, 71, :_reduce_45,
- 1, 77, :_reduce_46,
- 1, 78, :_reduce_47,
- 1, 72, :_reduce_48,
- 1, 65, :_reduce_49,
- 2, 66, :_reduce_50,
- 1, 66, :_reduce_51,
+ 2, 76, :_reduce_44,
+ 2, 75, :_reduce_45,
+ 2, 71, :_reduce_46,
+ 1, 77, :_reduce_47,
+ 1, 78, :_reduce_48,
+ 1, 72, :_reduce_49,
+ 1, 65, :_reduce_50,
+ 2, 66, :_reduce_51,
+ 1, 66, :_reduce_52,
  1, 81, :_reduce_none,
  1, 81, :_reduce_none,
  1, 81, :_reduce_none,
- 1, 82, :_reduce_55,
- 1, 83, :_reduce_56,
- 1, 84, :_reduce_57,
- 1, 85, :_reduce_58,
- 2, 67, :_reduce_59,
- 1, 87, :_reduce_60,
+ 1, 82, :_reduce_56,
+ 1, 83, :_reduce_57,
+ 1, 84, :_reduce_58,
+ 1, 85, :_reduce_59,
+ 2, 67, :_reduce_60,
  1, 87, :_reduce_61,
- 1, 88, :_reduce_62,
+ 1, 87, :_reduce_62,
  1, 88, :_reduce_63,
- 2, 63, :_reduce_64,
- 3, 63, :_reduce_65,
- 1, 63, :_reduce_66,
- 2, 63, :_reduce_67,
+ 1, 88, :_reduce_64,
+ 2, 63, :_reduce_65,
+ 3, 63, :_reduce_66,
+ 1, 63, :_reduce_67,
  2, 63, :_reduce_68,
- 2, 89, :_reduce_69,
- 2, 90, :_reduce_70,
- 3, 90, :_reduce_71,
- 1, 92, :_reduce_72,
- 1, 93, :_reduce_73,
- 1, 94, :_reduce_74,
+ 2, 63, :_reduce_69,
+ 2, 89, :_reduce_70,
+ 2, 90, :_reduce_71,
+ 3, 90, :_reduce_72,
+ 1, 92, :_reduce_73,
+ 1, 93, :_reduce_74,
+ 1, 94, :_reduce_75,
  1, 94, :_reduce_none,
- 3, 94, :_reduce_76,
- 1, 95, :_reduce_77,
- 3, 95, :_reduce_78,
+ 3, 94, :_reduce_77,
+ 1, 95, :_reduce_78,
+ 3, 95, :_reduce_79,
  1, 61, :_reduce_none,
  1, 79, :_reduce_none,
  1, 79, :_reduce_none,
- 1, 86, :_reduce_82,
- 2, 86, :_reduce_83,
- 1, 91, :_reduce_84,
- 2, 91, :_reduce_85,
+ 1, 86, :_reduce_83,
+ 2, 86, :_reduce_84,
+ 1, 91, :_reduce_85,
+ 2, 91, :_reduce_86,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
@@ -515,8 +518,8 @@ racc_reduce_table = [
  1, 74, :_reduce_none,
  1, 74, :_reduce_none,
  1, 74, :_reduce_none,
- 1, 97, :_reduce_98,
  1, 97, :_reduce_99,
+ 1, 97, :_reduce_100,
  1, 99, :_reduce_none,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
@@ -558,107 +561,107 @@ racc_reduce_table = [
  1, 100, :_reduce_none,
  1, 100, :_reduce_none,
  1, 100, :_reduce_none,
- 1, 101, :_reduce_141,
+ 1, 101, :_reduce_142,
  1, 102, :_reduce_none,
  1, 102, :_reduce_none,
- 3, 102, :_reduce_144,
- 1, 103, :_reduce_145,
+ 3, 102, :_reduce_145,
  1, 103, :_reduce_146,
  1, 103, :_reduce_147,
- 2, 103, :_reduce_148,
- 1, 103, :_reduce_149,
- 3, 103, :_reduce_150,
+ 1, 103, :_reduce_148,
+ 2, 103, :_reduce_149,
+ 1, 103, :_reduce_150,
+ 3, 103, :_reduce_151,
  1, 104, :_reduce_none,
- 2, 104, :_reduce_152,
  2, 104, :_reduce_153,
  2, 104, :_reduce_154,
+ 2, 104, :_reduce_155,
  1, 105, :_reduce_none,
  1, 106, :_reduce_none,
- 3, 106, :_reduce_157,
  3, 106, :_reduce_158,
  3, 106, :_reduce_159,
+ 3, 106, :_reduce_160,
  1, 107, :_reduce_none,
- 3, 107, :_reduce_161,
  3, 107, :_reduce_162,
+ 3, 107, :_reduce_163,
  1, 108, :_reduce_none,
- 3, 108, :_reduce_164,
  3, 108, :_reduce_165,
+ 3, 108, :_reduce_166,
  1, 109, :_reduce_none,
- 3, 109, :_reduce_167,
  3, 109, :_reduce_168,
  3, 109, :_reduce_169,
  3, 109, :_reduce_170,
+ 3, 109, :_reduce_171,
  1, 110, :_reduce_none,
- 3, 110, :_reduce_172,
  3, 110, :_reduce_173,
+ 3, 110, :_reduce_174,
  1, 111, :_reduce_none,
- 3, 111, :_reduce_175,
+ 3, 111, :_reduce_176,
  1, 112, :_reduce_none,
- 3, 112, :_reduce_177,
+ 3, 112, :_reduce_178,
  1, 113, :_reduce_none,
- 3, 113, :_reduce_179,
+ 3, 113, :_reduce_180,
  1, 114, :_reduce_none,
- 3, 114, :_reduce_181,
+ 3, 114, :_reduce_182,
  1, 115, :_reduce_none,
- 3, 115, :_reduce_183,
+ 3, 115, :_reduce_184,
  1, 116, :_reduce_none,
- 5, 116, :_reduce_185,
+ 5, 116, :_reduce_186,
  1, 80, :_reduce_none ]
 
-racc_reduce_n = 187
+racc_reduce_n = 188
 
-racc_shift_n = 231
+racc_shift_n = 232
 
 racc_action_table = [
-   166,   180,   181,   113,   119,   125,   131,   136,   139,    89,
+   167,   181,   182,   113,   119,   125,   131,   136,   139,    89,
     95,   100,   105,   108,   112,   117,   123,   130,   135,   138,
-    88,    94,   101,   106,   109,   114,    49,   211,    83,    84,
-   140,    91,   180,   181,    43,    45,    47,    48,    50,    51,
+    88,    94,   101,   106,   109,   114,    49,   212,    83,    84,
+   140,    91,   181,   182,    43,    45,    47,    48,    50,    51,
     53,    54,    38,    39,    40,    42,    44,    46,   118,   124,
-   129,   134,   141,    90,    93,    99,   166,   180,   181,   113,
+   129,   134,   141,    90,    93,    99,   167,   181,   182,   113,
    119,   125,   131,   136,   139,    89,    95,   100,   105,   108,
    112,   117,   123,   130,   135,   138,    88,    94,   101,   106,
-   109,   114,    49,   226,    83,    84,   140,    91,   160,   161,
+   109,   114,    49,   227,    83,    84,   140,    91,   161,   162,
     43,    45,    47,    48,    50,    51,    53,    54,    38,    39,
     40,    42,    44,    46,   118,   124,   129,   134,   141,    90,
-    93,    99,   166,   180,   181,   113,   119,   125,   131,   136,
+    93,    99,   167,   181,   182,   113,   119,   125,   131,   136,
    139,    89,    95,   100,   105,   108,   112,   117,   123,   130,
-   135,   138,    88,    94,   101,   106,   109,   114,    49,   163,
-    83,    84,   140,    91,   178,   179,    43,    45,    47,    48,
+   135,   138,    88,    94,   101,   106,   109,   114,    49,   164,
+    83,    84,   140,    91,   179,   180,    43,    45,    47,    48,
     50,    51,    53,    54,    38,    39,    40,    42,    44,    46,
-   118,   124,   129,   134,   141,    90,    93,    99,   166,   178,
-   179,   113,   119,   125,   131,   136,   139,    89,    95,   100,
+   118,   124,   129,   134,   141,    90,    93,    99,   167,   179,
+   180,   113,   119,   125,   131,   136,   139,    89,    95,   100,
    105,   108,   112,   117,   123,   130,   135,   138,    88,    94,
-   101,   106,   109,   114,    49,   169,    83,    84,   140,    91,
-   178,   179,    43,    45,    47,    48,    50,    51,    53,    54,
+   101,   106,   109,   114,    49,   170,    83,    84,   140,    91,
+   179,   180,    43,    45,    47,    48,    50,    51,    53,    54,
     38,    39,    40,    42,    44,    46,   118,   124,   129,   134,
-   141,    90,    93,    99,   103,   180,   181,   113,   119,   125,
+   141,    90,    93,    99,   103,   181,   182,   113,   119,   125,
    131,   136,   139,    89,    95,   100,   105,   108,   112,   117,
    123,   130,   135,   138,    88,    94,   101,   106,   109,   114,
-   120,   126,    83,    84,   140,    91,   160,   161,   144,   146,
-   115,   121,   127,   132,   137,   142,    92,    98,   102,   107,
+   120,   148,    83,    84,   140,    91,   161,   162,   144,   146,
+   115,   121,   126,   132,   137,   142,    92,    98,   102,   107,
    110,    16,   118,   124,   129,   134,   141,    90,    93,    99,
-   103,   227,   170,   113,   119,   125,   131,   136,   139,    89,
+   103,   228,   171,   113,   119,   125,   131,   136,   139,    89,
     95,   100,   105,   108,   112,   117,   123,   130,   135,   138,
-    88,    94,   101,   106,   109,   114,   120,   126,   172,   162,
-   140,    91,   166,   152,    11,    14,   115,   121,   127,   132,
+    88,    94,   101,   106,   109,   114,   120,   127,   173,   163,
+   140,    91,   167,   153,    11,    14,   115,   121,   126,   132,
    137,   142,    92,    98,   102,   107,   110,    16,   118,   124,
-   129,   134,   141,    90,    93,    99,   198,    24,    49,   162,
-   163,   171,    83,    84,   169,   170,    43,    45,    47,    48,
+   129,   134,   141,    90,    93,    99,   199,    24,    49,   163,
+   164,   172,    83,    84,   170,   171,    43,    45,    47,    48,
     50,    51,    53,    54,    38,    39,    40,    42,    44,    46,
-   168,    61,    82,   158,    70,   175,   176,   177,    77,    79,
-   183,   184,   185,   186,   175,   176,   177,   159,   183,   184,
-   185,   186,   201,    60,    63,    67,   225,    49,   183,   184,
-   185,   186,   175,   176,   177,    43,    45,    47,    48,    50,
+   169,    61,    82,   159,    70,   176,   177,   178,    77,    79,
+   184,   185,   186,   187,   176,   177,   178,   160,   184,   185,
+   186,   187,   202,    60,    63,    67,   226,    49,   184,   185,
+   186,   187,   176,   177,   178,    43,    45,    47,    48,    50,
     51,    53,    54,    38,    39,    40,    42,    44,    46,    73,
     61,   nil,   nil,    70,   nil,   nil,   nil,    77,    79,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    60,    63,    67,   166,    49,   nil,   nil,   nil,
+   nil,   nil,    60,    63,    67,   167,    49,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    43,    45,    47,    48,    50,    51,
     53,    54,    38,    39,    40,    42,    44,    46,    73,   nil,
    nil,    49,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,
     45,    47,    48,    50,    51,    53,    54,    38,    39,    40,
-    42,    44,    46,   168,    61,   nil,   nil,    70,   nil,   nil,
+    42,    44,    46,   169,    61,   nil,   nil,    70,   nil,   nil,
    nil,    77,    79,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,    60,    63,    67,   nil,
     49,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,    45,
@@ -776,9 +779,9 @@ racc_action_table = [
     47,    48,    50,    51,    53,    54,    38,    39,    40,    42,
     44,    46,    73,    49,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,    43,    45,    47,    48,    50,    51,    53,    54,    38,
-    39,    40,    42,    44,    46,    49,   198,   199,   nil,   nil,
+    39,    40,    42,    44,    46,    49,   199,   200,   nil,   nil,
    nil,   nil,   nil,    43,    45,    47,    48,    50,    51,    53,
-    54,    38,    39,    40,    42,    44,    46,    49,   nil,   229,
+    54,    38,    39,    40,    42,    44,    46,    49,   nil,   230,
    nil,   nil,   nil,   nil,   nil,    43,    45,    47,    48,    50,
     51,    53,    54,    38,    39,    40,    42,    44,    46,    49,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,    45,    47,
@@ -792,141 +795,141 @@ racc_action_table = [
      1,   nil,     8,    10,    12,    16 ]
 
 racc_action_check = [
-   151,   219,   219,   151,   151,   151,   151,   151,   151,   151,
-   151,   151,   151,   151,   151,   151,   151,   151,   151,   151,
-   151,   151,   151,   151,   151,   151,   151,   174,   151,   151,
-   151,   151,   220,   220,   151,   151,   151,   151,   151,   151,
-   151,   151,   151,   151,   151,   151,   151,   151,   151,   151,
-   151,   151,   151,   151,   151,   151,    86,   221,   221,    86,
+   152,   220,   220,   152,   152,   152,   152,   152,   152,   152,
+   152,   152,   152,   152,   152,   152,   152,   152,   152,   152,
+   152,   152,   152,   152,   152,   152,   152,   175,   152,   152,
+   152,   152,   221,   221,   152,   152,   152,   152,   152,   152,
+   152,   152,   152,   152,   152,   152,   152,   152,   152,   152,
+   152,   152,   152,   152,   152,   152,    86,   222,   222,    86,
     86,    86,    86,    86,    86,    86,    86,    86,    86,    86,
     86,    86,    86,    86,    86,    86,    86,    86,    86,    86,
-    86,    86,    86,   206,    86,    86,    86,    86,    55,    55,
+    86,    86,    86,   207,    86,    86,    86,    86,    55,    55,
     86,    86,    86,    86,    86,    86,    86,    86,    86,    86,
     86,    86,    86,    86,    86,    86,    86,    86,    86,    86,
-    86,    86,    80,   222,   222,    80,    80,    80,    80,    80,
+    86,    86,    80,   223,   223,    80,    80,    80,    80,    80,
     80,    80,    80,    80,    80,    80,    80,    80,    80,    80,
-    80,    80,    80,    80,    80,    80,    80,    80,    80,   207,
-    80,    80,    80,    80,   218,   218,    80,    80,    80,    80,
+    80,    80,    80,    80,    80,    80,    80,    80,    80,   208,
+    80,    80,    80,    80,   219,   219,    80,    80,    80,    80,
     80,    80,    80,    80,    80,    80,    80,    80,    80,    80,
-    80,    80,    80,    80,    80,    80,    80,    80,   190,   217,
-   217,   190,   190,   190,   190,   190,   190,   190,   190,   190,
-   190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
-   190,   190,   190,   190,   190,   208,   190,   190,   190,   190,
-    75,    75,   190,   190,   190,   190,   190,   190,   190,   190,
-   190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
-   190,   190,   190,   190,     9,    76,    76,     9,     9,     9,
+    80,    80,    80,    80,    80,    80,    80,    80,   191,   218,
+   218,   191,   191,   191,   191,   191,   191,   191,   191,   191,
+   191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
+   191,   191,   191,   191,   191,   209,   191,   191,   191,   191,
+    75,    75,   191,   191,   191,   191,   191,   191,   191,   191,
+   191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
+   191,   191,   191,   191,     9,    76,    76,     9,     9,     9,
      9,     9,     9,     9,     9,     9,     9,     9,     9,     9,
      9,     9,     9,     9,     9,     9,     9,     9,     9,     9,
-     9,     9,    13,    13,     9,     9,   204,   204,     9,     9,
+     9,     9,    13,    13,     9,     9,   205,   205,     9,     9,
      9,     9,     9,     9,     9,     9,     9,     9,     9,     9,
      9,     9,     9,     9,     9,     9,     9,     9,     9,     9,
-     6,   209,   210,     6,     6,     6,     6,     6,     6,     6,
+     6,   210,   211,     6,     6,     6,     6,     6,     6,     6,
      6,     6,     6,     6,     6,     6,     6,     6,     6,     6,
-     6,     6,     6,     6,     6,     6,     6,     6,    68,   205,
+     6,     6,     6,     6,     6,     6,     6,     6,    68,   206,
      6,     6,    59,    15,     6,     6,     6,     6,     6,     6,
      6,     6,     6,     6,     6,     6,     6,     6,     6,     6,
-     6,     6,     6,     6,     6,     6,   196,    19,    59,    56,
+     6,     6,     6,     6,     6,     6,   197,    19,    59,    56,
     57,    68,     4,     4,    62,    65,    59,    59,    59,    59,
     59,    59,    59,    59,    59,    59,    59,    59,    59,    59,
-    59,   169,     4,    35,   169,   216,   216,   216,   169,   169,
-   203,   203,   203,   203,    74,    74,    74,    35,    78,    78,
-    78,    78,   152,   169,   169,   169,   197,   169,   202,   202,
-   202,   202,   215,   215,   215,   169,   169,   169,   169,   169,
-   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
-   172,   nil,   nil,   172,   nil,   nil,   nil,   172,   172,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   172,   172,   172,   168,   172,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   172,   172,   172,   172,   172,   172,
-   172,   172,   172,   172,   172,   172,   172,   172,   172,   nil,
-   nil,   168,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   168,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   170,   nil,   nil,   170,   nil,   nil,
-   nil,   170,   170,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   170,   170,   170,   nil,
-   170,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   170,   170,
+    59,   170,     4,    35,   170,   217,   217,   217,   170,   170,
+   204,   204,   204,   204,    74,    74,    74,    35,    78,    78,
+    78,    78,   153,   170,   170,   170,   198,   170,   203,   203,
+   203,   203,   216,   216,   216,   170,   170,   170,   170,   170,
    170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-   170,   170,   170,   163,   nil,   nil,   163,   nil,   nil,   nil,
-   163,   163,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   163,   163,   163,   nil,   163,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   163,   163,   163,
+   173,   nil,   nil,   173,   nil,   nil,   nil,   173,   173,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   173,   173,   173,   169,   173,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   173,   173,   173,   173,   173,   173,
+   173,   173,   173,   173,   173,   173,   173,   173,   173,   nil,
+   nil,   169,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,
+   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
+   169,   169,   169,   169,   171,   nil,   nil,   171,   nil,   nil,
+   nil,   171,   171,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   171,   171,   171,   nil,
+   171,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   171,   171,
+   171,   171,   171,   171,   171,   171,   171,   171,   171,   171,
+   171,   171,   171,   164,   nil,   nil,   164,   nil,   nil,   nil,
+   164,   164,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   164,   164,   164,   nil,   164,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   164,   164,   164,
+   164,   164,   164,   164,   164,   164,   164,   164,   164,   164,
+   164,   164,   163,   nil,   nil,   163,   nil,   nil,   nil,   163,
+   163,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   163,   163,   163,   nil,   163,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   163,   163,   163,   163,
    163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
-   163,   163,   162,   nil,   nil,   162,   nil,   nil,   nil,   162,
-   162,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   162,   162,   162,   nil,   162,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   162,   162,   162,   162,
-   162,   162,   162,   162,   162,   162,   162,   162,   162,   162,
-   162,   186,   nil,   nil,   186,   nil,   nil,   nil,   186,   186,
+   163,   187,   nil,   nil,   187,   nil,   nil,   nil,   187,   187,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   186,   186,   186,   nil,   186,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   186,   186,   186,   186,   186,
-   186,   186,   186,   186,   186,   186,   186,   186,   186,   186,
-   185,   nil,   nil,   185,   nil,   nil,   nil,   185,   185,   nil,
+   nil,   nil,   nil,   187,   187,   187,   nil,   187,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   187,   187,   187,   187,   187,
+   187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
+   186,   nil,   nil,   186,   nil,   nil,   nil,   186,   186,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   185,   185,   185,   nil,   185,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   185,   185,   185,   185,   185,   185,
-   185,   185,   185,   185,   185,   185,   185,   185,   185,   184,
-   nil,   nil,   184,   nil,   nil,   nil,   184,   184,   nil,   nil,
+   nil,   nil,   186,   186,   186,   nil,   186,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   186,   186,   186,   186,   186,   186,
+   186,   186,   186,   186,   186,   186,   186,   186,   186,   185,
+   nil,   nil,   185,   nil,   nil,   nil,   185,   185,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   184,   184,   184,   nil,   184,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   184,   184,   184,   184,   184,   184,   184,
-   184,   184,   184,   184,   184,   184,   184,   184,   183,   nil,
-   nil,   183,   nil,   nil,   nil,   183,   183,   nil,   nil,   nil,
+   nil,   185,   185,   185,   nil,   185,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   185,   185,   185,   185,   185,   185,   185,
+   185,   185,   185,   185,   185,   185,   185,   185,   184,   nil,
+   nil,   184,   nil,   nil,   nil,   184,   184,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   183,   183,   183,   nil,   183,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   183,   183,   183,   183,   183,   183,   183,   183,
-   183,   183,   183,   183,   183,   183,   183,     5,   nil,   nil,
+   184,   184,   184,   nil,   184,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   184,   184,   184,   184,   184,   184,   184,   184,
+   184,   184,   184,   184,   184,   184,   184,     5,   nil,   nil,
      5,   nil,   nil,   nil,     5,     5,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,
      5,     5,   nil,     5,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,     5,     5,     5,     5,     5,     5,     5,     5,     5,
-     5,     5,     5,     5,     5,     5,   181,   nil,   nil,   181,
-   nil,   nil,   nil,   181,   181,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   181,   181,
-   181,   nil,   181,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     5,     5,     5,     5,     5,     5,   182,   nil,   nil,   182,
+   nil,   nil,   nil,   182,   182,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   182,   182,
+   182,   nil,   182,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
+   182,   182,   182,   182,   182,   181,   nil,   nil,   181,   nil,
+   nil,   nil,   181,   181,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   181,   181,   181,
+   nil,   181,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   181,
    181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
-   181,   181,   181,   181,   181,   180,   nil,   nil,   180,   nil,
-   nil,   nil,   180,   180,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   180,   180,   180,
-   nil,   180,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   180,
-   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-   180,   180,   180,   180,   161,   nil,   nil,   161,   nil,   nil,
-   nil,   161,   161,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   161,   161,   161,   nil,
-   161,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   161,   161,
-   161,   161,   161,   161,   161,   161,   161,   161,   161,   161,
-   161,   161,   161,   175,   nil,   nil,   175,   nil,   nil,   nil,
-   175,   175,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   175,   175,   175,   nil,   175,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   175,   175,   175,
-   175,   175,   175,   175,   175,   175,   175,   175,   175,   175,
-   175,   175,    73,   nil,   nil,    73,   nil,   nil,   nil,    73,
+   181,   181,   181,   181,   162,   nil,   nil,   162,   nil,   nil,
+   nil,   162,   162,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   162,   162,   162,   nil,
+   162,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   162,   162,
+   162,   162,   162,   162,   162,   162,   162,   162,   162,   162,
+   162,   162,   162,   176,   nil,   nil,   176,   nil,   nil,   nil,
+   176,   176,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   176,   176,   176,   nil,   176,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   176,   176,   176,
+   176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
+   176,   176,    73,   nil,   nil,    73,   nil,   nil,   nil,    73,
     73,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    73,    73,    73,   nil,    73,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,    73,    73,    73,    73,
     73,    73,    73,    73,    73,    73,    73,    73,    73,    73,
-    73,   179,   nil,   nil,   179,   nil,   nil,   nil,   179,   179,
+    73,   180,   nil,   nil,   180,   nil,   nil,   nil,   180,   180,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   179,   179,   179,   nil,   179,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   179,   179,   179,   179,   179,
-   179,   179,   179,   179,   179,   179,   179,   179,   179,   179,
-   178,   nil,   nil,   178,   nil,   nil,   nil,   178,   178,   nil,
+   nil,   nil,   nil,   180,   180,   180,   nil,   180,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   180,   180,   180,   180,   180,
+   180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
+   179,   nil,   nil,   179,   nil,   nil,   nil,   179,   179,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   178,   178,   178,   nil,   178,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   178,   178,   178,   178,   178,   178,
-   178,   178,   178,   178,   178,   178,   178,   178,   178,   177,
-   nil,   nil,   177,   nil,   nil,   nil,   177,   177,   nil,   nil,
+   nil,   nil,   179,   179,   179,   nil,   179,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   179,   179,   179,   179,   179,   179,
+   179,   179,   179,   179,   179,   179,   179,   179,   179,   178,
+   nil,   nil,   178,   nil,   nil,   nil,   178,   178,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   177,   177,   177,   nil,   177,    77,   nil,   nil,   nil,
-   nil,   nil,   nil,   177,   177,   177,   177,   177,   177,   177,
-   177,   177,   177,   177,   177,   177,   177,   177,    77,    77,
+   nil,   178,   178,   178,   nil,   178,    77,   nil,   nil,   nil,
+   nil,   nil,   nil,   178,   178,   178,   178,   178,   178,   178,
+   178,   178,   178,   178,   178,   178,   178,   178,    77,    77,
     77,   nil,    77,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
     77,    77,    77,    77,    77,    77,    77,    77,    77,    77,
-    77,    77,    77,    77,    77,   176,   nil,   nil,   176,   nil,
-   nil,   nil,   176,   176,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   176,   176,   176,
-   nil,   176,    79,   nil,   nil,   nil,   nil,   nil,   nil,   176,
-   176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
-   176,   176,   176,   176,    79,    79,    79,   nil,    79,   nil,
+    77,    77,    77,    77,    77,   177,   nil,   nil,   177,   nil,
+   nil,   nil,   177,   177,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   177,   177,   177,
+   nil,   177,    79,   nil,   nil,   nil,   nil,   nil,   nil,   177,
+   177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+   177,   177,   177,   177,    79,    79,    79,   nil,    79,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,    79,    79,    79,    79,
     79,    79,    79,    79,    79,    79,    79,    79,    79,    79,
     79,     2,   nil,   nil,     2,   nil,   nil,   nil,     2,     2,
@@ -934,33 +937,33 @@ racc_action_check = [
    nil,   nil,   nil,     2,     2,     2,   nil,     2,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   160,   nil,   nil,   160,   nil,   nil,   nil,   160,   160,   nil,
+   161,   nil,   nil,   161,   nil,   nil,   nil,   161,   161,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   160,   160,   160,   nil,   160,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   160,   160,   160,   160,   160,   160,
-   160,   160,   160,   160,   160,   160,   160,   160,   160,   171,
-   nil,   nil,   171,   nil,   nil,   nil,   171,   171,   nil,   nil,
+   nil,   nil,   161,   161,   161,   nil,   161,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   161,   161,   161,   161,   161,   161,
+   161,   161,   161,   161,   161,   161,   161,   161,   161,   172,
+   nil,   nil,   172,   nil,   nil,   nil,   172,   172,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   171,   171,   171,   nil,   171,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   171,   171,   171,   171,   171,   171,   171,
-   171,   171,   171,   171,   171,   171,   171,   171,    97,   nil,
+   nil,   172,   172,   172,   nil,   172,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   172,   172,   172,   172,   172,   172,   172,
+   172,   172,   172,   172,   172,   172,   172,   172,    97,   nil,
    nil,    97,   nil,   nil,   nil,    97,    97,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
     97,    97,    97,   nil,    97,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,    97,    97,    97,    97,    97,    97,    97,    97,
-    97,    97,    97,    97,    97,    97,    97,   227,   nil,   nil,
-   227,   nil,   nil,   nil,   227,   227,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   227,
-   227,   227,   nil,   227,    70,   nil,   nil,   nil,   nil,   nil,
-   nil,   227,   227,   227,   227,   227,   227,   227,   227,   227,
-   227,   227,   227,   227,   227,   227,    70,    70,    70,   nil,
+    97,    97,    97,    97,    97,    97,    97,   228,   nil,   nil,
+   228,   nil,   nil,   nil,   228,   228,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   228,
+   228,   228,   nil,   228,    70,   nil,   nil,   nil,   nil,   nil,
+   nil,   228,   228,   228,   228,   228,   228,   228,   228,   228,
+   228,   228,   228,   228,   228,   228,    70,    70,    70,   nil,
     70,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    70,    70,
     70,    70,    70,    70,    70,    70,    70,    70,    70,    70,
     70,    70,    70,    81,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,    81,    81,    81,    81,    81,    81,    81,    81,    81,
-    81,    81,    81,    81,    81,   225,    81,    81,   nil,   nil,
-   nil,   nil,   nil,   225,   225,   225,   225,   225,   225,   225,
-   225,   225,   225,   225,   225,   225,   225,    17,   nil,   225,
+    81,    81,    81,    81,    81,   226,    81,    81,   nil,   nil,
+   nil,   nil,   nil,   226,   226,   226,   226,   226,   226,   226,
+   226,   226,   226,   226,   226,   226,   226,    17,   nil,   226,
    nil,   nil,   nil,   nil,   nil,    17,    17,    17,    17,    17,
     17,    17,    17,    17,    17,    17,    17,    17,    17,    21,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,    21,    21,
@@ -989,66 +992,66 @@ racc_action_pointer = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    -2,   382,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-  1418,   972,   580,   531,   nil,   nil,   nil,   nil,   433,   359,
-   482,  1467,   408,   nil,   -24,  1021,  1293,  1217,  1168,  1119,
-   923,   874,   nil,   776,   727,   678,   629,   nil,   nil,   nil,
-   166,   nil,   nil,   nil,   nil,   nil,   285,   333,   nil,   nil,
-   nil,   nil,   375,   357,   239,   290,    32,   119,   174,   224,
-   260,   nil,   nil,   nil,   nil,   386,   359,   160,   135,   -10,
-    21,    46,   102,   nil,   nil,  1637,   nil,  1565,   nil,   nil,
-   nil ]
+   nil,   nil,    -2,   382,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,  1418,   972,   580,   531,   nil,   nil,   nil,   nil,   433,
+   359,   482,  1467,   408,   nil,   -24,  1021,  1293,  1217,  1168,
+  1119,   923,   874,   nil,   776,   727,   678,   629,   nil,   nil,
+   nil,   166,   nil,   nil,   nil,   nil,   nil,   285,   333,   nil,
+   nil,   nil,   nil,   375,   357,   239,   290,    32,   119,   174,
+   224,   260,   nil,   nil,   nil,   nil,   386,   359,   160,   135,
+   -10,    21,    46,   102,   nil,   nil,  1637,   nil,  1565,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-  -187,  -187,   -40,    -7,   -66,   -41,  -187,    -8,   -57,  -187,
-   -58,   -47,   -56,   -51,   -48,  -187,   -49,  -187,   -37,  -187,
-   -52,  -187,   -39,    -2,   -79,   -53,   -46,    -3,   -60,   -54,
-    -4,   -61,   -36,    -5,  -187,  -187,   -38,    -6,  -110,  -111,
-  -112,   -68,  -113,  -105,  -114,  -104,  -106,  -102,  -103,   -80,
-  -101,  -107,   -81,  -108,  -109,  -174,  -176,  -178,  -149,  -187,
-  -145,  -141,  -180,  -146,   -44,  -182,  -151,  -147,  -184,  -155,
-  -187,  -186,  -156,  -187,  -160,  -163,  -166,  -187,  -171,  -187,
-   -67,  -187,   -72,   -98,   -99,   -82,   -64,   -45,  -135,  -122,
-   -97,   -94,   -31,  -137,  -136,  -123,   -95,  -187,   -32,  -138,
-  -126,   -90,   -33,   -27,    -9,  -127,   -91,   -34,  -128,   -92,
-   -35,   -11,  -129,  -116,   -93,   -21,   -12,  -130,  -124,  -117,
-   -26,   -22,   -13,  -131,  -125,  -118,   -25,   -23,   -15,  -139,
-  -132,  -119,   -28,   -24,  -140,  -133,  -120,   -29,  -134,  -121,
-  -115,   -96,   -30,   -14,   -17,   -10,   -18,   -16,   -20,   -19,
-   -50,   -55,  -187,   -42,    -1,   -43,   -69,   -59,   -63,   -62,
-  -187,  -187,  -187,  -187,  -143,  -142,  -100,  -148,  -187,  -187,
-  -187,  -187,  -187,  -152,  -187,  -187,  -187,  -187,  -187,  -187,
-  -187,  -187,  -153,  -187,  -187,  -187,  -187,  -154,   -89,   -88,
-   -65,   -86,   -87,   -84,   -77,   -70,  -187,   -75,   -73,   -74,
-   -83,   231,  -172,  -173,  -175,  -177,  -187,  -179,  -181,  -187,
-  -183,  -150,  -157,  -158,  -159,  -161,  -162,  -164,  -165,  -167,
-  -169,  -168,  -170,   -85,   -71,  -187,  -144,  -187,   -78,   -76,
-  -185 ]
+  -188,  -188,   -41,    -7,   -67,   -42,  -188,    -8,   -58,  -188,
+   -59,   -48,   -57,   -52,   -49,  -188,   -50,  -188,   -38,  -188,
+   -53,  -188,   -40,    -2,   -80,   -54,   -47,    -3,   -61,   -55,
+    -4,   -62,   -37,    -5,  -188,  -188,   -39,    -6,  -111,  -112,
+  -113,   -69,  -114,  -106,  -115,  -105,  -107,  -103,  -104,   -81,
+  -102,  -108,   -82,  -109,  -110,  -175,  -177,  -179,  -150,  -188,
+  -146,  -142,  -181,  -147,   -45,  -183,  -152,  -148,  -185,  -156,
+  -188,  -187,  -157,  -188,  -161,  -164,  -167,  -188,  -172,  -188,
+   -68,  -188,   -73,   -99,  -100,   -83,   -65,   -46,  -136,  -123,
+   -98,   -95,   -32,  -138,  -137,  -124,   -96,  -188,   -33,  -139,
+  -127,   -91,   -34,   -28,    -9,  -128,   -92,   -35,  -129,   -93,
+   -36,   -11,  -130,  -117,   -94,   -23,   -12,  -131,  -125,  -118,
+   -27,   -24,   -13,  -132,  -126,  -119,   -25,   -16,   -15,  -140,
+  -133,  -120,   -29,   -26,  -141,  -134,  -121,   -30,  -135,  -122,
+  -116,   -97,   -31,   -14,   -18,   -10,   -19,   -17,   -22,   -21,
+   -20,   -51,   -56,  -188,   -43,    -1,   -44,   -70,   -60,   -64,
+   -63,  -188,  -188,  -188,  -188,  -144,  -143,  -101,  -149,  -188,
+  -188,  -188,  -188,  -188,  -153,  -188,  -188,  -188,  -188,  -188,
+  -188,  -188,  -188,  -154,  -188,  -188,  -188,  -188,  -155,   -90,
+   -89,   -66,   -87,   -88,   -85,   -78,   -71,  -188,   -76,   -74,
+   -75,   -84,   232,  -173,  -174,  -176,  -178,  -188,  -180,  -182,
+  -188,  -184,  -151,  -158,  -159,  -160,  -162,  -163,  -165,  -166,
+  -168,  -170,  -169,  -171,   -86,   -72,  -188,  -145,  -188,   -79,
+   -77,  -186 ]
 
 racc_goto_table = [
-    41,    64,   195,   193,    23,   167,   164,    29,   173,   150,
-    85,   128,    37,    86,   148,   182,   153,   187,   143,    85,
-   155,   149,   151,   154,     5,    18,    22,   212,   213,   214,
-    97,   116,   122,   156,   133,   202,   203,   133,   219,   220,
-   221,   222,   111,   217,   218,   147,   215,   216,    20,    25,
-    13,     2,    35,   157,     4,    80,   190,    81,   165,    36,
-   196,   197,    32,   145,   104,     7,     3,    33,    30,    27,
-    15,    19,   174,   204,   205,   207,   208,   210,   230,   189,
-   194,   nil,   nil,   nil,   nil,   189,   nil,   nil,   nil,   nil,
+    41,    64,   196,   194,    23,   168,   165,    29,   174,   151,
+    85,   128,    37,    86,   149,   183,   154,   188,   143,    85,
+   156,   150,   152,   155,     5,    18,    22,   213,   214,   215,
+    97,   116,   122,   157,   133,   203,   204,   133,   220,   221,
+   222,   223,   111,   218,   219,   147,   216,   217,    20,    25,
+    13,     2,    35,   158,     4,    80,   191,    81,   166,    36,
+   197,   198,    32,   145,   104,     7,     3,    33,    30,    27,
+    15,    19,   175,   205,   206,   208,   209,   211,   231,   190,
+   195,   nil,   nil,   nil,   nil,   190,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   223,   206,   164,   nil,   224,   nil,   nil,
+   nil,   nil,   nil,   nil,   224,   207,   165,   nil,   225,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   189,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   165,   nil,   nil,
-   209,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   189,
+   nil,   190,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   166,   nil,
+   nil,   210,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   190,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   228 ]
+   nil,   nil,   nil,   nil,   nil,   229 ]
 
 racc_goto_check = [
     21,    22,    35,    40,     3,    44,    41,    27,    45,    24,
@@ -1062,33 +1065,33 @@ racc_goto_check = [
     21,   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    40,    44,    41,   nil,    35,   nil,   nil,
+   nil,   nil,   nil,   nil,    40,    44,    41,   nil,    35,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,   nil,   nil,
-    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,
+   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,   nil,
+   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    21 ]
+   nil,   nil,   nil,   nil,   nil,    21 ]
 
 racc_goto_pointer = [
    nil,    70,    71,     4,    69,    68,    67,    12,    66,    65,
     58,    54,    36,    25,    26,     5,    28,    62,    59,    51,
     24,    -1,    -1,    50,    -4,    48,    49,     7,     9,    52,
     18,    54,    51,   -24,    53,   -79,   -21,   -20,   nil,     6,
-   -77,   -53,   nil,   nil,   -54,   -62,   nil,  -148,  -132,  -137,
-  -145,  -125,   -89,   -89,   -94,   -94,   -95,   nil,  -149 ]
+   -77,   -53,   nil,   nil,   -54,   -62,   nil,  -149,  -133,  -138,
+  -146,  -126,   -90,   -90,   -95,   -95,   -96,   nil,  -150 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   191,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   192,   nil,   nil,   nil,
    nil,    58,    87,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    52,   192,
-   200,   188,    96,    59,   nil,    66,    69,    72,    74,    75,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    52,   193,
+   201,   189,    96,    59,   nil,    66,    69,    72,    74,    75,
     76,    78,    55,    56,    57,    62,    65,    68,    71 ]
 
 racc_token_table = {
@@ -1356,15 +1359,15 @@ module_eval <<'.,.,', 'src/preprocessor.y', 54
   end
 .,.,
 
- # reduce 16 omitted
-
-module_eval <<'.,.,', 'src/preprocessor.y', 59
-  def _reduce_17( val, _values, result )
- result = [:IGNORE, nil]
+module_eval <<'.,.,', 'src/preprocessor.y', 55
+  def _reduce_16( val, _values, result )
+ result = [:NEWLINE, val[0]]
    result
   end
 .,.,
 
+ # reduce 17 omitted
+
 module_eval <<'.,.,', 'src/preprocessor.y', 60
   def _reduce_18( val, _values, result )
  result = [:IGNORE, nil]
@@ -1372,25 +1375,25 @@ module_eval <<'.,.,', 'src/preprocessor.y', 60
   end
 .,.,
 
- # reduce 19 omitted
-
-module_eval <<'.,.,', 'src/preprocessor.y', 62
-  def _reduce_20( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 61
+  def _reduce_19( val, _values, result )
  result = [:IGNORE, nil]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 66
+ # reduce 20 omitted
+
+module_eval <<'.,.,', 'src/preprocessor.y', 63
   def _reduce_21( val, _values, result )
- result = [:IGNORE_OPEN, nil]
+ result = [:IGNORE, nil]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 67
+module_eval <<'.,.,', 'src/preprocessor.y', 64
   def _reduce_22( val, _values, result )
- result = [:IGNORE_OPEN, nil]
+ result = [:NEWLINE, val[0]]
    result
   end
 .,.,
@@ -1402,9 +1405,19 @@ module_eval <<'.,.,', 'src/preprocessor.y', 68
   end
 .,.,
 
- # reduce 24 omitted
+module_eval <<'.,.,', 'src/preprocessor.y', 69
+  def _reduce_24( val, _values, result )
+ result = [:IGNORE_OPEN, nil]
+   result
+  end
+.,.,
 
- # reduce 25 omitted
+module_eval <<'.,.,', 'src/preprocessor.y', 70
+  def _reduce_25( val, _values, result )
+ result = [:IGNORE_OPEN, nil]
+   result
+  end
+.,.,
 
  # reduce 26 omitted
 
@@ -1434,12 +1447,7 @@ module_eval <<'.,.,', 'src/preprocessor.y', 68
 
  # reduce 39 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 92
-  def _reduce_40( val, _values, result )
- result = [val[0], false]
-   result
-  end
-.,.,
+ # reduce 40 omitted
 
 module_eval <<'.,.,', 'src/preprocessor.y', 93
   def _reduce_41( val, _values, result )
@@ -1448,281 +1456,286 @@ module_eval <<'.,.,', 'src/preprocessor.y', 93
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 97
+module_eval <<'.,.,', 'src/preprocessor.y', 94
   def _reduce_42( val, _values, result )
- result = [:OPEN, self.defined?(val[1])]
+ result = [val[0], false]
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 98
   def _reduce_43( val, _values, result )
- result = [:OPEN, !self.defined?(val[1])]
+ result = [:OPEN, self.defined?(val[1])]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 102
+module_eval <<'.,.,', 'src/preprocessor.y', 99
   def _reduce_44( val, _values, result )
- result = [ val[0], val[1] != 0 ]
+ result = [:OPEN, !self.defined?(val[1])]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 106
+module_eval <<'.,.,', 'src/preprocessor.y', 103
   def _reduce_45( val, _values, result )
  result = [ val[0], val[1] != 0 ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 110
+module_eval <<'.,.,', 'src/preprocessor.y', 107
   def _reduce_46( val, _values, result )
- result = :OPEN; self.set_resolve_nonspace
+ result = [ val[0], val[1] != 0 ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 114
+module_eval <<'.,.,', 'src/preprocessor.y', 111
   def _reduce_47( val, _values, result )
- result = :CONTINUE; self.set_resolve_nonspace
+ result = :OPEN; self.set_resolve_nonspace
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 118
+module_eval <<'.,.,', 'src/preprocessor.y', 115
   def _reduce_48( val, _values, result )
- result = [:CONTINUE, true]
+ result = :CONTINUE; self.set_resolve_nonspace
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 122
+module_eval <<'.,.,', 'src/preprocessor.y', 119
   def _reduce_49( val, _values, result )
- result = [:CLOSE, false]
+ result = [:CONTINUE, true]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 126
+module_eval <<'.,.,', 'src/preprocessor.y', 123
   def _reduce_50( val, _values, result )
- result = val[0,2]
+ result = [:CLOSE, false]
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 127
   def _reduce_51( val, _values, result )
- result = val[0,1]
+ result = val[0,2]
    result
   end
 .,.,
 
- # reduce 52 omitted
+module_eval <<'.,.,', 'src/preprocessor.y', 128
+  def _reduce_52( val, _values, result )
+ result = val[0,1]
+   result
+  end
+.,.,
 
  # reduce 53 omitted
 
  # reduce 54 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 137
-  def _reduce_55( val, _values, result )
- result = val[0].join
-   result
-  end
-.,.,
+ # reduce 55 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 141
+module_eval <<'.,.,', 'src/preprocessor.y', 138
   def _reduce_56( val, _values, result )
- result = :PRAGMA; self.set_source
+ result = val[0].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 145
+module_eval <<'.,.,', 'src/preprocessor.y', 142
   def _reduce_57( val, _values, result )
- result = :ERROR; self.set_source
+ result = :PRAGMA; self.set_source
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 149
+module_eval <<'.,.,', 'src/preprocessor.y', 146
   def _reduce_58( val, _values, result )
- result = :WARNING; self.set_source
+ result = :ERROR; self.set_source
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 154
+module_eval <<'.,.,', 'src/preprocessor.y', 150
   def _reduce_59( val, _values, result )
- result = val[0,2]; self.set_nonspace
+ result = :WARNING; self.set_source
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 164
+module_eval <<'.,.,', 'src/preprocessor.y', 155
   def _reduce_60( val, _values, result )
- result = :INCLUDE; self.set_resolve_nonspace
+ result = val[0,2]; self.set_nonspace
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 165
   def _reduce_61( val, _values, result )
- result = :INCLUDE_NEXT; self.set_resolve_nonspace
+ result = :INCLUDE; self.set_resolve_nonspace
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 169
+module_eval <<'.,.,', 'src/preprocessor.y', 166
   def _reduce_62( val, _values, result )
- val[0] =~ /\A"(.*)"\Z/; result = $1
+ result = :INCLUDE_NEXT; self.set_resolve_nonspace
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 170
   def _reduce_63( val, _values, result )
- result = self.get_include_file
+ val[0] =~ /\A"(.*)"\Z/; result = $1
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 176
+module_eval <<'.,.,', 'src/preprocessor.y', 171
   def _reduce_64( val, _values, result )
- result = [ :DEFINE, val[0], nil, val[1] ]
+ result = self.get_include_file
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 178
+module_eval <<'.,.,', 'src/preprocessor.y', 177
   def _reduce_65( val, _values, result )
- result = [ :DEFINE, val[0], val[1], val[2] ]
+ result = [ :DEFINE, val[0], nil, val[1] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 181
+module_eval <<'.,.,', 'src/preprocessor.y', 179
   def _reduce_66( val, _values, result )
- result = [ :DEFINE, val[0], nil, [] ]
+ result = [ :DEFINE, val[0], val[1], val[2] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 183
+module_eval <<'.,.,', 'src/preprocessor.y', 182
   def _reduce_67( val, _values, result )
- result = [ :DEFINE, val[0], val[1], [] ]
+ result = [ :DEFINE, val[0], nil, [] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 186
+module_eval <<'.,.,', 'src/preprocessor.y', 184
   def _reduce_68( val, _values, result )
- result = [ :UNDEF, val[1] ]
+ result = [ :DEFINE, val[0], val[1], [] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 190
+module_eval <<'.,.,', 'src/preprocessor.y', 187
   def _reduce_69( val, _values, result )
- result = val[1]; self.set_source
+ result = [ :UNDEF, val[1] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 194
+module_eval <<'.,.,', 'src/preprocessor.y', 191
   def _reduce_70( val, _values, result )
- result = Parameters.new()
+ result = val[1]; self.set_source
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 195
   def _reduce_71( val, _values, result )
- result = val[1]
+ result = Parameters.new()
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 200
+module_eval <<'.,.,', 'src/preprocessor.y', 196
   def _reduce_72( val, _values, result )
- result = val[0]; self.set_nonspace
+ result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 205
+module_eval <<'.,.,', 'src/preprocessor.y', 201
   def _reduce_73( val, _values, result )
- result = val[0]; self.set_source
+ result = val[0]; self.set_nonspace
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 209
+module_eval <<'.,.,', 'src/preprocessor.y', 206
   def _reduce_74( val, _values, result )
+ result = val[0]; self.set_source
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/preprocessor.y', 210
+  def _reduce_75( val, _values, result )
  result = Parameters.new(); result.with_ellipses
    result
   end
 .,.,
 
- # reduce 75 omitted
+ # reduce 76 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 211
-  def _reduce_76( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 212
+  def _reduce_77( val, _values, result )
  result = val[0]; result.with_ellipses
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 215
-  def _reduce_77( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 216
+  def _reduce_78( val, _values, result )
  result = Parameters.new() << val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 216
-  def _reduce_78( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 217
+  def _reduce_79( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
- # reduce 79 omitted
-
  # reduce 80 omitted
 
  # reduce 81 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 231
-  def _reduce_82( val, _values, result )
+ # reduce 82 omitted
+
+module_eval <<'.,.,', 'src/preprocessor.y', 232
+  def _reduce_83( val, _values, result )
  result = ['']
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 232
-  def _reduce_83( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 233
+  def _reduce_84( val, _values, result )
  result = val[0] << val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 236
-  def _reduce_84( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 237
+  def _reduce_85( val, _values, result )
  result = val[0,1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 237
-  def _reduce_85( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 238
+  def _reduce_86( val, _values, result )
  result = val[0] << val[1]
    result
   end
 .,.,
 
- # reduce 86 omitted
-
  # reduce 87 omitted
 
  # reduce 88 omitted
@@ -1745,22 +1758,22 @@ module_eval <<'.,.,', 'src/preprocessor.y', 237
 
  # reduce 97 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 262
-  def _reduce_98( val, _values, result )
+ # reduce 98 omitted
+
+module_eval <<'.,.,', 'src/preprocessor.y', 263
+  def _reduce_99( val, _values, result )
  result = ' '
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 263
-  def _reduce_99( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 264
+  def _reduce_100( val, _values, result )
  result = ' '
    result
   end
 .,.,
 
- # reduce 100 omitted
-
  # reduce 101 omitted
 
  # reduce 102 omitted
@@ -1841,247 +1854,249 @@ module_eval <<'.,.,', 'src/preprocessor.y', 263
 
  # reduce 140 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 320
-  def _reduce_141( val, _values, result )
+ # reduce 141 omitted
+
+module_eval <<'.,.,', 'src/preprocessor.y', 321
+  def _reduce_142( val, _values, result )
  result = val[0]; self.set_nonspace
    result
   end
 .,.,
 
- # reduce 142 omitted
-
  # reduce 143 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 326
-  def _reduce_144( val, _values, result )
- result = val[1]
-   result
-  end
-.,.,
+ # reduce 144 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 330
+module_eval <<'.,.,', 'src/preprocessor.y', 327
   def _reduce_145( val, _values, result )
- result = eval(val[0].delete("ULul"))
+ result = val[1]
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 331
   def _reduce_146( val, _values, result )
- result = eval(val[0])
+ result = eval(val[0].delete("ULul"))
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 332
   def _reduce_147( val, _values, result )
- val[0] =~ /\A'(.*)'\Z/; result = eval('?' + $1)
+ result = eval(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 334
+module_eval <<'.,.,', 'src/preprocessor.y', 333
   def _reduce_148( val, _values, result )
- result = self.defined?(val[1]) ? 1 : 0; self.set_resolve_nonspace
+ val[0] =~ /\A'(.*)'\Z/; result = eval('?' + $1)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 342
+module_eval <<'.,.,', 'src/preprocessor.y', 335
   def _reduce_149( val, _values, result )
- result = 0
+ result = self.defined?(val[1]) ? 1 : 0; self.set_resolve_nonspace
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 343
   def _reduce_150( val, _values, result )
- result = val[1]
+ result = 0
    result
   end
 .,.,
 
- # reduce 151 omitted
-
-module_eval <<'.,.,', 'src/preprocessor.y', 348
-  def _reduce_152( val, _values, result )
- result = (val[1] == 0) ? 1 : 0
+module_eval <<'.,.,', 'src/preprocessor.y', 344
+  def _reduce_151( val, _values, result )
+ result = val[1]
    result
   end
 .,.,
 
+ # reduce 152 omitted
+
 module_eval <<'.,.,', 'src/preprocessor.y', 349
   def _reduce_153( val, _values, result )
- result = +val[1]
+ result = (val[1] == 0) ? 1 : 0
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'src/preprocessor.y', 350
   def _reduce_154( val, _values, result )
- result = -val[1]
+ result = +val[1]
    result
   end
 .,.,
 
- # reduce 155 omitted
+module_eval <<'.,.,', 'src/preprocessor.y', 351
+  def _reduce_155( val, _values, result )
+ result = -val[1]
+   result
+  end
+.,.,
 
  # reduce 156 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 359
-  def _reduce_157( val, _values, result )
+ # reduce 157 omitted
+
+module_eval <<'.,.,', 'src/preprocessor.y', 360
+  def _reduce_158( val, _values, result )
  result = val[0] * val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 360
-  def _reduce_158( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 361
+  def _reduce_159( val, _values, result )
  result = val[0] / val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 361
-  def _reduce_159( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 362
+  def _reduce_160( val, _values, result )
  result = val[0] % val[2]
    result
   end
 .,.,
 
- # reduce 160 omitted
+ # reduce 161 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 366
-  def _reduce_161( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 367
+  def _reduce_162( val, _values, result )
  result = val[0] + val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 367
-  def _reduce_162( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 368
+  def _reduce_163( val, _values, result )
  result = val[0] - val[2]
    result
   end
 .,.,
 
- # reduce 163 omitted
+ # reduce 164 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 372
-  def _reduce_164( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 373
+  def _reduce_165( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 373
-  def _reduce_165( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 374
+  def _reduce_166( val, _values, result )
  result = val[0] >> val[2]
    result
   end
 .,.,
 
- # reduce 166 omitted
+ # reduce 167 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 379
-  def _reduce_167( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 380
+  def _reduce_168( val, _values, result )
  result = (val[0] < val[2]) ? 1 : 0
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 381
-  def _reduce_168( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 382
+  def _reduce_169( val, _values, result )
  result = (val[0] > val[2]) ? 1 : 0
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 383
-  def _reduce_169( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 384
+  def _reduce_170( val, _values, result )
  result = (val[0] <= val[2]) ? 1 : 0
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 385
-  def _reduce_170( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 386
+  def _reduce_171( val, _values, result )
  result = (val[0] >= val[2]) ? 1 : 0
    result
   end
 .,.,
 
- # reduce 171 omitted
+ # reduce 172 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 391
-  def _reduce_172( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 392
+  def _reduce_173( val, _values, result )
  result = (val[0] == val[2]) ? 1 : 0
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 393
-  def _reduce_173( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 394
+  def _reduce_174( val, _values, result )
  result = (val[0] != val[2]) ? 1 : 0
    result
   end
 .,.,
 
- # reduce 174 omitted
+ # reduce 175 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 398
-  def _reduce_175( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 399
+  def _reduce_176( val, _values, result )
  result = val[0] & val[2]
    result
   end
 .,.,
 
- # reduce 176 omitted
+ # reduce 177 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 403
-  def _reduce_177( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 404
+  def _reduce_178( val, _values, result )
  result = val[0] ^ val[2]
    result
   end
 .,.,
 
- # reduce 178 omitted
+ # reduce 179 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 408
-  def _reduce_179( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 409
+  def _reduce_180( val, _values, result )
  result = val[0] | val[2]
    result
   end
 .,.,
 
- # reduce 180 omitted
+ # reduce 181 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 414
-  def _reduce_181( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 415
+  def _reduce_182( val, _values, result )
  result = (val[0] != 0 and val[2] != 0) ? 1 : 0
    result
   end
 .,.,
 
- # reduce 182 omitted
+ # reduce 183 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 420
-  def _reduce_183( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 421
+  def _reduce_184( val, _values, result )
  result = (val[0] != 0 or val[2] != 0) ? 1 : 0
    result
   end
 .,.,
 
- # reduce 184 omitted
+ # reduce 185 omitted
 
-module_eval <<'.,.,', 'src/preprocessor.y', 426
-  def _reduce_185( val, _values, result )
+module_eval <<'.,.,', 'src/preprocessor.y', 427
+  def _reduce_186( val, _values, result )
  result = val[0] != 0 ? val[2] : val[4]
    result
   end
 .,.,
 
- # reduce 186 omitted
+ # reduce 187 omitted
 
  def _reduce_none( val, _values, result )
   result