dbc 1.3.0 → 2.0.0

data/lib/dbc/ocl.rb

@@ -8,9 +8,9 @@ require 'racc/parser'
 
 
 
-require 'dbc/ctype'
-require 'dbc/ctokenizer'
-require 'dbc/parseerrorhandler'
+require 'caphir/ctype'
+require 'caphir/ctokenizer'
+require 'caphir/parseerrorhandler'
 
 class String
 	def cexp?; true end
@@ -417,7 +417,7 @@ module OCL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end src/ocl.y modeval..id8fdb3e31c0', 'src/ocl.y', 877
+module_eval <<'..end src/ocl.y modeval..ida0db268282', 'src/ocl.y', 882
 
 	def initialize(str, file, line)
 		@line = line
@@ -522,7 +522,7 @@ protected
 		t
 	end
 
-..end src/ocl.y modeval..id8fdb3e31c0
+..end src/ocl.y modeval..ida0db268282
 
 ##### racc 1.4.4 generates ###
 
@@ -535,221 +535,223 @@ racc_reduce_table = [
  1, 72, :_reduce_5,
  2, 72, :_reduce_6,
  3, 73, :_reduce_7,
+ 1, 75, :_reduce_8,
+ 2, 75, :_reduce_9,
+ 2, 75, :_reduce_10,
  1, 75, :_reduce_none,
- 1, 75, :_reduce_none,
- 3, 74, :_reduce_10,
- 2, 78, :_reduce_11,
- 1, 80, :_reduce_none,
- 1, 80, :_reduce_none,
- 1, 80, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 3, 81, :_reduce_19,
- 1, 77, :_reduce_none,
- 1, 77, :_reduce_21,
- 1, 77, :_reduce_none,
- 1, 77, :_reduce_none,
+ 3, 74, :_reduce_12,
+ 2, 80, :_reduce_13,
+ 1, 82, :_reduce_none,
+ 1, 82, :_reduce_none,
  1, 82, :_reduce_none,
- 4, 82, :_reduce_25,
- 4, 82, :_reduce_26,
- 3, 82, :_reduce_27,
- 3, 82, :_reduce_28,
- 3, 82, :_reduce_29,
- 1, 84, :_reduce_none,
- 2, 84, :_reduce_31,
  1, 83, :_reduce_none,
- 3, 83, :_reduce_33,
- 1, 85, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 3, 83, :_reduce_21,
+ 1, 79, :_reduce_none,
+ 1, 79, :_reduce_23,
+ 1, 79, :_reduce_none,
+ 1, 79, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 4, 84, :_reduce_27,
+ 4, 84, :_reduce_28,
+ 3, 84, :_reduce_29,
+ 3, 84, :_reduce_30,
+ 3, 84, :_reduce_31,
+ 1, 86, :_reduce_none,
+ 2, 86, :_reduce_33,
  1, 85, :_reduce_none,
+ 3, 85, :_reduce_35,
  1, 87, :_reduce_none,
- 2, 87, :_reduce_37,
- 2, 87, :_reduce_38,
- 2, 87, :_reduce_39,
- 2, 87, :_reduce_40,
- 2, 87, :_reduce_41,
- 2, 87, :_reduce_42,
- 2, 87, :_reduce_43,
- 4, 87, :_reduce_44,
- 6, 87, :_reduce_45,
- 6, 87, :_reduce_46,
- 1, 88, :_reduce_none,
- 4, 88, :_reduce_48,
+ 1, 87, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 2, 89, :_reduce_39,
+ 2, 89, :_reduce_40,
+ 2, 89, :_reduce_41,
+ 2, 89, :_reduce_42,
+ 2, 89, :_reduce_43,
+ 2, 89, :_reduce_44,
+ 2, 89, :_reduce_45,
+ 4, 89, :_reduce_46,
+ 6, 89, :_reduce_47,
+ 6, 89, :_reduce_48,
  1, 90, :_reduce_none,
- 3, 90, :_reduce_50,
- 3, 90, :_reduce_51,
- 3, 90, :_reduce_52,
- 1, 91, :_reduce_none,
- 3, 91, :_reduce_54,
- 3, 91, :_reduce_55,
+ 4, 90, :_reduce_50,
  1, 92, :_reduce_none,
- 3, 92, :_reduce_57,
+ 3, 92, :_reduce_52,
+ 3, 92, :_reduce_53,
+ 3, 92, :_reduce_54,
+ 1, 93, :_reduce_none,
+ 3, 93, :_reduce_56,
+ 3, 93, :_reduce_57,
  1, 94, :_reduce_none,
  3, 94, :_reduce_59,
- 3, 94, :_reduce_60,
- 3, 94, :_reduce_61,
- 3, 94, :_reduce_62,
- 1, 95, :_reduce_none,
- 3, 95, :_reduce_64,
- 3, 95, :_reduce_65,
  1, 96, :_reduce_none,
- 3, 96, :_reduce_67,
+ 3, 96, :_reduce_61,
+ 3, 96, :_reduce_62,
+ 3, 96, :_reduce_63,
+ 3, 96, :_reduce_64,
  1, 97, :_reduce_none,
- 3, 97, :_reduce_69,
+ 3, 97, :_reduce_66,
+ 3, 97, :_reduce_67,
  1, 98, :_reduce_none,
- 3, 98, :_reduce_71,
+ 3, 98, :_reduce_69,
  1, 99, :_reduce_none,
- 3, 99, :_reduce_73,
+ 3, 99, :_reduce_71,
  1, 100, :_reduce_none,
- 3, 100, :_reduce_75,
+ 3, 100, :_reduce_73,
  1, 101, :_reduce_none,
- 3, 101, :_reduce_77,
- 1, 79, :_reduce_none,
- 3, 79, :_reduce_79,
- 3, 89, :_reduce_80,
- 3, 93, :_reduce_81,
- 3, 93, :_reduce_82,
+ 3, 101, :_reduce_75,
  1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 1, 103, :_reduce_none,
+ 3, 102, :_reduce_77,
  1, 103, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 2, 76, :_reduce_96,
- 1, 76, :_reduce_97,
- 1, 107, :_reduce_98,
- 2, 107, :_reduce_99,
- 1, 108, :_reduce_100,
- 1, 108, :_reduce_101,
- 1, 108, :_reduce_102,
- 1, 108, :_reduce_103,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 2, 109, :_reduce_106,
+ 3, 103, :_reduce_79,
+ 1, 81, :_reduce_none,
+ 3, 81, :_reduce_81,
+ 3, 91, :_reduce_82,
+ 3, 95, :_reduce_83,
+ 3, 95, :_reduce_84,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
  1, 105, :_reduce_none,
- 2, 105, :_reduce_108,
- 1, 106, :_reduce_109,
- 2, 112, :_reduce_110,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 106, :_reduce_none,
+ 1, 106, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 2, 104, :_reduce_98,
+ 1, 104, :_reduce_99,
+ 1, 108, :_reduce_100,
+ 2, 108, :_reduce_101,
+ 1, 109, :_reduce_102,
+ 1, 109, :_reduce_103,
+ 1, 109, :_reduce_104,
+ 1, 109, :_reduce_105,
  1, 112, :_reduce_none,
- 1, 115, :_reduce_none,
- 1, 114, :_reduce_113,
- 3, 114, :_reduce_114,
- 4, 114, :_reduce_115,
- 3, 114, :_reduce_116,
- 4, 114, :_reduce_117,
- 4, 114, :_reduce_118,
- 3, 114, :_reduce_119,
- 2, 110, :_reduce_120,
- 2, 113, :_reduce_121,
- 1, 113, :_reduce_122,
- 3, 113, :_reduce_123,
- 2, 113, :_reduce_124,
- 1, 118, :_reduce_125,
- 2, 118, :_reduce_126,
- 1, 116, :_reduce_127,
- 3, 116, :_reduce_128,
- 1, 119, :_reduce_129,
- 3, 119, :_reduce_130,
- 2, 120, :_reduce_131,
- 2, 120, :_reduce_132,
- 1, 120, :_reduce_133,
- 1, 117, :_reduce_134,
- 1, 122, :_reduce_135,
- 3, 122, :_reduce_136,
- 1, 86, :_reduce_137,
- 2, 86, :_reduce_138,
- 1, 121, :_reduce_139,
- 1, 123, :_reduce_140,
+ 1, 112, :_reduce_none,
+ 2, 110, :_reduce_108,
+ 1, 76, :_reduce_none,
+ 2, 76, :_reduce_110,
+ 1, 78, :_reduce_111,
+ 2, 113, :_reduce_112,
+ 1, 113, :_reduce_none,
+ 1, 116, :_reduce_none,
+ 1, 115, :_reduce_115,
+ 3, 115, :_reduce_116,
+ 4, 115, :_reduce_117,
+ 3, 115, :_reduce_118,
+ 4, 115, :_reduce_119,
+ 4, 115, :_reduce_120,
+ 3, 115, :_reduce_121,
+ 2, 111, :_reduce_122,
+ 2, 114, :_reduce_123,
+ 1, 114, :_reduce_124,
+ 3, 114, :_reduce_125,
+ 2, 114, :_reduce_126,
+ 1, 119, :_reduce_127,
+ 2, 119, :_reduce_128,
+ 1, 117, :_reduce_129,
+ 3, 117, :_reduce_130,
+ 1, 120, :_reduce_131,
+ 3, 120, :_reduce_132,
+ 2, 121, :_reduce_133,
+ 2, 121, :_reduce_134,
+ 1, 121, :_reduce_135,
+ 1, 118, :_reduce_136,
+ 1, 122, :_reduce_137,
+ 3, 122, :_reduce_138,
+ 1, 88, :_reduce_139,
+ 2, 88, :_reduce_140,
+ 1, 77, :_reduce_141,
+ 1, 123, :_reduce_142,
  1, 123, :_reduce_none,
- 2, 123, :_reduce_142,
+ 2, 123, :_reduce_144,
  3, 124, :_reduce_none,
- 2, 124, :_reduce_144,
- 3, 124, :_reduce_145,
- 3, 124, :_reduce_146,
- 4, 124, :_reduce_147,
- 2, 124, :_reduce_148,
- 3, 124, :_reduce_149,
- 3, 124, :_reduce_150,
- 4, 124, :_reduce_151 ]
+ 2, 124, :_reduce_146,
+ 3, 124, :_reduce_147,
+ 3, 124, :_reduce_148,
+ 4, 124, :_reduce_149,
+ 2, 124, :_reduce_150,
+ 3, 124, :_reduce_151,
+ 3, 124, :_reduce_152,
+ 4, 124, :_reduce_153 ]
 
-racc_reduce_n = 152
+racc_reduce_n = 154
 
-racc_shift_n = 239
+racc_shift_n = 241
 
 clist = [
-'44,47,15,20,124,91,31,34,91,91,124,91,91,127,124,135,28,90,91,140,123',
-'114,236,231,17,21,25,59,33,235,221,40,134,99,100,16,135,24,29,102,140',
-'84,38,42,93,94,53,56,58,61,63,65,67,68,70,72,75,52,55,57,44,47,15,20',
-'52,55,31,34,52,55,127,91,93,94,141,98,28,213,91,101,200,140,192,193',
-'17,21,25,59,33,196,186,40,237,210,187,16,194,24,29,124,124,195,38,42',
-'92,124,53,56,58,61,63,65,67,68,70,72,75,52,55,57,44,47,15,20,127,127',
-'31,34,78,177,127,213,123,178,186,140,28,123,187,119,33,107,108,40,17',
-'21,25,59,33,24,29,40,87,88,89,16,152,24,29,131,177,216,38,42,178,116',
-'53,56,58,61,63,65,67,68,70,72,75,52,55,57,44,47,15,20,119,33,31,34,40',
-'33,93,94,40,86,24,29,28,179,24,29,33,107,108,40,17,21,25,59,33,24,29',
-'40,87,88,89,16,124,24,29,9,11,12,38,42,93,94,53,56,58,61,63,65,67,68',
-'70,72,75,52,55,57,59,87,88,89,33,112,111,40,135,180,124,110,140,24,29',
-'104,105,106,103,53,56,58,61,63,65,67,68,70,72,75,52,55,57,109,59,127',
-'5,7,9,11,12,112,213,180,110,199,140,104,105,106,103,228,229,53,56,58',
-'61,63,65,67,68,70,72,75,52,55,57,44,47,15,20,230,86,31,34,104,105,106',
-'103,9,11,12,84,28,9,11,12,78,198,234,197,17,21,25,114,33,91,49,40,48',
-'211,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21',
-'25,,33,,,40,,,,79,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,',
-',,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,',
-',,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,',
-'31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47',
-'15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38',
-'42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24',
-'29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40',
-',,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25',
-',33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,',
-',17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,',
-',28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31',
-'34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15',
-'20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42',
-'44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29',
-',,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,',
-'16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33',
-',,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17',
-'21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28',
-',,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,',
-',,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,220,,38,42,44,47,15',
-'20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42',
-'44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29',
-',,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,',
-'16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33',
-',,40,,,,16,,24,29,,190,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,',
-'17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,',
-'28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34',
-',,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20',
-',,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44',
-'47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,209',
-',38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16',
-',24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,',
-',40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21',
-'25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,',
-',,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,,31,34,,,,',
-',,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47,15,20,,',
-'31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38,42,44,47',
-'15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24,29,,,,38',
-'42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,,33,,,40,,,,16,,24',
-'29,,,,38,42,44,47,15,20,,,31,34,,,,,,,,,28,,,,,,,,17,21,25,59,33,,,40',
-',,,16,,24,29,,,,38,42,,,53,56,58,61,63,65,67,68,70,72,75,52,55,57,59',
-'33,,,40,,,,,,24,29,,,,59,,,,53,56,58,61,63,65,67,68,70,72,75,52,55,57',
-'233,53,56,58,61,63,65,67,68,70,72,75,52,55,57,59,53,56,58,61,63,65,67',
-'68,70,,,,,,,,,,53,56,58,61,63,65,67,68,70,72,75,52,55,57,59,,,,,,,,',
-'217,,,,,59,,,,,53,56,58,61,63,65,67,68,70,72,75,52,55,57,53,56,58,61',
-'63,65,67,68,70,72,75,52,55,57,59,33,,,40,,,,,205,24,29,,,,,,,,53,56',
-'58,61,63,65,67,68,70,72,75,52,55,57' ]
-racc_action_table = arr = Array.new(2112, nil)
+'44,47,14,19,125,94,31,35,94,94,125,189,94,131,125,190,27,93,94,83,197',
+'206,138,216,16,20,24,60,32,131,233,40,239,101,102,15,123,23,28,104,130',
+'125,38,42,96,97,53,56,58,61,62,63,65,67,69,71,74,52,55,57,44,47,14,19',
+'52,55,31,35,52,55,139,94,94,139,130,100,27,130,94,103,96,97,193,194',
+'16,20,24,60,32,202,237,40,238,96,97,15,200,23,28,125,125,201,38,42,122',
+'125,53,56,58,61,62,63,65,67,69,71,74,52,55,57,44,47,14,19,131,131,31',
+'35,96,97,131,123,197,209,183,130,27,197,184,118,32,110,111,40,16,20',
+'24,60,32,23,28,40,183,86,131,15,184,23,28,115,95,123,38,42,113,130,53',
+'56,58,61,62,63,65,67,69,71,74,52,55,57,44,47,14,19,118,32,31,35,40,32',
+'110,111,40,189,23,28,27,190,23,28,32,204,85,40,16,20,24,60,32,23,28',
+'40,9,11,12,15,158,23,28,125,205,109,38,42,203,99,53,56,58,61,62,63,65',
+'67,69,71,74,52,55,57,89,90,91,60,131,77,88,32,88,86,40,123,174,125,113',
+'130,23,28,106,107,108,105,53,56,58,61,62,63,65,67,69,71,74,52,55,57',
+'85,60,5,7,9,11,12,83,77,139,174,232,94,130,106,107,108,105,234,235,53',
+'56,58,61,62,63,65,67,69,71,74,52,55,57,44,47,14,19,236,137,31,35,106',
+'107,108,105,9,11,12,196,27,89,90,91,9,11,12,195,16,20,24,49,32,48,191',
+'40,89,90,91,78,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,',
+',16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,',
+',27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31',
+'35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14',
+'19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42',
+'44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28',
+',,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,',
+'15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32',
+',,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16',
+'20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27',
+',,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,',
+',,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19',
+',,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44',
+'47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,',
+',38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15',
+',23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,',
+',40,,,,15,,23,28,,223,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16',
+'20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27',
+',,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,',
+',,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19',
+',,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,215,,38,42',
+'44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28',
+',,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,',
+'15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32',
+',,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16',
+'20,24,,32,,,40,,,,15,,23,28,,186,,38,42,44,47,14,19,,,31,35,,,,,,,,',
+'27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35',
+',,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19',
+',,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44',
+'47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,',
+',38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15',
+',23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,',
+',40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20',
+'24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,',
+',,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,',
+',,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47,14,19,,',
+'31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38,42,44,47',
+'14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23,28,,,,38',
+'42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40,,,,15,,23',
+'28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24,,32,,,40',
+',,,15,,23,28,,,,38,42,44,47,14,19,,,31,35,,,,,,,,,27,,,,,,,,16,20,24',
+'60,32,,,40,,,,15,,23,28,,,,38,42,,,53,56,58,61,62,63,65,67,69,71,74',
+'52,55,57,60,32,,,40,,,,,,23,28,,,60,,,,,53,56,58,61,62,63,65,67,69,71',
+'74,52,55,57,53,56,58,61,62,63,65,67,69,71,74,52,55,57,60,53,56,58,61',
+'62,63,65,67,69,,,,,60,,,,231,53,56,58,61,62,63,65,67,69,71,74,52,55',
+'57,53,56,58,61,62,63,65,67,69,71,74,52,55,57,60,,,,,,,,,212,,,,,,,,',
+',53,56,58,61,62,63,65,67,69,71,74,52,55,57,60,32,,,40,,,,,218,23,28',
+',,,,,,,53,56,58,61,62,63,65,67,69,71,74,52,55,57' ]
+racc_action_table = arr = Array.new(2114, nil)
 str = a = i = nil
 idx = 0
 clist.each do |str|
@@ -760,77 +762,77 @@ clist.each do |str|
 end
 
 clist = [
-'195,195,195,195,82,208,195,195,225,26,124,219,189,126,175,139,195,26',
-'81,139,126,45,225,208,195,195,195,195,195,219,189,195,81,35,35,195,82',
-'195,195,35,82,143,195,195,148,148,195,195,195,195,195,195,195,195,195',
-'195,195,195,195,195,79,79,79,79,124,124,79,79,175,175,214,159,27,27',
-'83,35,79,214,227,35,172,214,148,148,79,79,79,79,79,159,188,79,227,181',
-'188,79,154,79,79,183,66,154,79,79,27,123,79,79,79,79,79,79,79,79,79',
-'79,79,79,79,79,98,98,98,98,183,66,98,98,142,176,123,183,66,176,138,183',
-'98,123,138,57,57,168,168,57,98,98,98,98,98,57,57,98,151,151,151,98,98',
-'98,98,73,128,184,98,98,128,49,98,98,98,98,98,98,98,98,98,98,98,98,98',
-'98,16,16,16,16,62,62,16,16,62,99,222,222,99,147,62,62,16,133,99,99,100',
-'37,37,100,16,16,16,16,16,100,100,16,150,150,150,16,135,16,16,77,77,77',
-'16,16,223,223,16,16,16,16,16,16,16,16,16,16,16,16,16,16,135,23,23,23',
-'228,43,42,228,135,135,213,41,135,228,228,164,164,164,164,135,135,135',
-'135,135,135,135,135,135,135,135,135,135,135,38,213,213,0,0,0,0,0,171',
-'213,213,170,169,213,165,165,165,165,204,206,213,213,213,213,213,213',
-'213,213,213,213,213,213,213,213,105,105,105,105,207,22,105,105,36,36',
-'36,36,8,8,8,19,105,6,6,6,13,167,218,166,105,105,105,132,105,153,3,105',
-'2,182,,105,,105,105,,,,105,105,15,15,15,15,,,15,15,,,,,,,,,15,,,,,,',
-',15,15,15,,15,,,15,,,,15,,15,15,,,,15,15,20,20,20,20,,,20,20,,,,,,,',
-',20,,,,,,,,20,20,20,,20,,,20,,,,20,,20,20,,,,20,20,108,108,108,108,',
-',108,108,,,,,,,,,108,,,,,,,,108,108,108,,108,,,108,,,,108,,108,108,',
-',,108,108,199,199,199,199,,,199,199,,,,,,,,,199,,,,,,,,199,199,199,',
-'199,,,199,,,,199,,199,199,,,,199,199,107,107,107,107,,,107,107,,,,,',
-',,,107,,,,,,,,107,107,107,,107,,,107,,,,107,,107,107,,,,107,107,106',
-'106,106,106,,,106,106,,,,,,,,,106,,,,,,,,106,106,106,,106,,,106,,,,106',
-',106,106,,,,106,106,28,28,28,28,,,28,28,,,,,,,,,28,,,,,,,,28,28,28,',
-'28,,,28,,,,28,,28,28,,,,28,28,31,31,31,31,,,31,31,,,,,,,,,31,,,,,,,',
-'31,31,31,,31,,,31,,,,31,,31,31,,,,31,31,34,34,34,34,,,34,34,,,,,,,,',
-'34,,,,,,,,34,34,34,,34,,,34,,,,34,,34,34,,,,34,34,110,110,110,110,,',
-'110,110,,,,,,,,,110,,,,,,,,110,110,110,,110,,,110,,,,110,,110,110,,',
-',110,110,198,198,198,198,,,198,198,,,,,,,,,198,,,,,,,,198,198,198,,198',
-',,198,,,,198,,198,198,,,,198,198,197,197,197,197,,,197,197,,,,,,,,,197',
-',,,,,,,197,197,197,,197,,,197,,,,197,,197,197,,,,197,197,112,112,112',
-'112,,,112,112,,,,,,,,,112,,,,,,,,112,112,112,,112,,,112,,,,112,,112',
-'112,,,,112,112,193,193,193,193,,,193,193,,,,,,,,,193,,,,,,,,193,193',
-'193,,193,,,193,,,,193,,193,193,,,,193,193,192,192,192,192,,,192,192',
-',,,,,,,,192,,,,,,,,192,192,192,,192,,,192,,,,192,,192,192,,,,192,192',
-'114,114,114,114,,,114,114,,,,,,,,,114,,,,,,,,114,114,114,,114,,,114',
-',,,114,,114,114,,,,114,114,44,44,44,44,,,44,44,,,,,,,,,44,,,,,,,,44',
-'44,44,,44,,,44,,,,44,,44,44,,,,44,44,187,187,187,187,,,187,187,,,,,',
-',,,187,,,,,,,,187,187,187,,187,,,187,,,,187,,187,187,,187,,187,187,47',
-'47,47,47,,,47,47,,,,,,,,,47,,,,,,,,47,47,47,,47,,,47,,,,47,,47,47,,',
-',47,47,104,104,104,104,,,104,104,,,,,,,,,104,,,,,,,,104,104,104,,104',
-',,104,,,,104,,104,104,,,,104,104,103,103,103,103,,,103,103,,,,,,,,,103',
-',,,,,,,103,103,103,,103,,,103,,,,103,,103,103,,,,103,103,140,140,140',
-'140,,,140,140,,,,,,,,,140,,,,,,,,140,140,140,,140,,,140,,,,140,,140',
-'140,,140,,140,140,88,88,88,88,,,88,88,,,,,,,,,88,,,,,,,,88,88,88,,88',
-',,88,,,,88,,88,88,,,,88,88,141,141,141,141,,,141,141,,,,,,,,,141,,,',
-',,,,141,141,141,,141,,,141,,,,141,,141,141,,,,141,141,94,94,94,94,,',
-'94,94,,,,,,,,,94,,,,,,,,94,94,94,,94,,,94,,,,94,,94,94,,,,94,94,93,93',
-'93,93,,,93,93,,,,,,,,,93,,,,,,,,93,93,93,,93,,,93,,,,93,,93,93,,,,93',
-'93,178,178,178,178,,,178,178,,,,,,,,,178,,,,,,,,178,178,178,,178,,,178',
-',,,178,,178,178,,178,,178,178,78,78,78,78,,,78,78,,,,,,,,,78,,,,,,,',
-'78,78,78,,78,,,78,,,,78,,78,78,,,,78,78,1,1,1,1,,,1,1,,,,,,,,,1,,,,',
-',,,1,1,1,,1,,,1,,,,1,,1,1,,,,1,1,92,92,92,92,,,92,92,,,,,,,,,92,,,,',
-',,,92,92,92,,92,,,92,,,,92,,92,92,,,,92,92,91,91,91,91,,,91,91,,,,,',
-',,,91,,,,,,,,91,91,91,,91,,,91,,,,91,,91,91,,,,91,91,89,89,89,89,,,89',
-'89,,,,,,,,,89,,,,,,,,89,89,89,,89,,,89,,,,89,,89,89,,,,89,89,84,84,84',
-'84,,,84,84,,,,,,,,,84,,,,,,,,84,84,84,,84,,,84,,,,84,,84,84,,,,84,84',
-'86,86,86,86,,,86,86,,,,,,,,,86,,,,,,,,86,86,86,,86,,,86,,,,86,,86,86',
-',,,86,86,87,87,87,87,,,87,87,,,,,,,,,87,,,,,,,,87,87,87,,87,,,87,,,',
-'87,,87,87,,,,87,87,101,101,101,101,,,101,101,,,,,,,,,101,,,,,,,,101',
-'101,101,64,101,,,101,,,,101,,101,101,,,,101,101,,,64,64,64,64,64,64',
-'64,64,64,64,64,64,64,64,7,7,,,7,,,,,,7,7,,,,216,,,,7,7,7,7,7,7,7,7,7',
-'7,7,7,7,7,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216',
-'111,60,60,60,60,60,60,60,60,60,,,,,,,,,,111,111,111,111,111,111,111',
-'111,111,111,111,111,111,111,186,,,,,,,,,186,,,,,109,,,,,186,186,186',
-'186,186,186,186,186,186,186,186,186,186,186,109,109,109,109,109,109',
-'109,109,109,109,109,109,109,109,177,177,,,177,,,,,177,177,177,,,,,,',
-',177,177,177,177,177,177,177,177,177,177,177,177,177,177' ]
-racc_action_check = arr = Array.new(2112, nil)
+'201,201,201,201,178,185,201,201,81,33,182,188,214,199,125,188,201,33',
+'229,143,199,177,81,185,201,201,201,201,201,178,214,201,229,39,39,201',
+'178,201,201,39,178,82,201,201,150,150,201,201,201,201,201,201,201,201',
+'201,201,201,201,201,201,78,78,78,78,182,182,78,78,125,125,141,164,222',
+'82,141,39,78,82,226,39,224,224,150,150,78,78,78,78,78,164,222,78,226',
+'225,225,78,160,78,78,75,156,160,78,78,72,197,78,78,78,78,78,78,78,78',
+'78,78,78,78,78,78,15,15,15,15,75,156,15,15,34,34,197,75,156,179,187',
+'75,15,197,187,57,57,172,172,57,15,15,15,15,15,57,57,15,128,145,132,15',
+'128,15,15,48,34,132,15,15,46,132,15,15,15,15,15,15,15,15,15,15,15,15',
+'15,15,100,100,100,100,66,66,100,100,66,101,43,43,101,133,66,66,100,133',
+'101,101,102,175,144,102,100,100,100,100,100,102,102,100,6,6,6,100,100',
+'100,100,123,176,42,100,100,169,38,100,100,100,100,100,100,100,100,100',
+'100,100,100,100,100,152,152,152,123,123,142,149,234,29,26,234,123,123',
+'139,135,123,234,234,171,171,171,171,123,123,123,123,123,123,123,123',
+'123,123,123,123,123,123,21,139,0,0,0,0,0,17,13,139,139,213,159,139,41',
+'41,41,41,217,220,139,139,139,139,139,139,139,139,139,139,139,139,139',
+'139,14,14,14,14,221,80,14,14,170,170,170,170,8,8,8,155,14,153,153,153',
+'76,76,76,154,14,14,14,3,14,2,136,14,30,30,30,14,,14,14,,,,14,14,203',
+'203,203,203,,,203,203,,,,,,,,,203,,,,,,,,203,203,203,,203,,,203,,,,203',
+',203,203,,,,203,203,19,19,19,19,,,19,19,,,,,,,,,19,,,,,,,,19,19,19,',
+'19,,,19,,,,19,,19,19,,,,19,19,110,110,110,110,,,110,110,,,,,,,,,110',
+',,,,,,,110,110,110,,110,,,110,,,,110,,110,110,,,,110,110,108,108,108',
+'108,,,108,108,,,,,,,,,108,,,,,,,,108,108,108,,108,,,108,,,,108,,108',
+'108,,,,108,108,27,27,27,27,,,27,27,,,,,,,,,27,,,,,,,,27,27,27,,27,,',
+'27,,,,27,,27,27,,,,27,27,196,196,196,196,,,196,196,,,,,,,,,196,,,,,',
+',,196,196,196,,196,,,196,,,,196,,196,196,,,,196,196,195,195,195,195',
+',,195,195,,,,,,,,,195,,,,,,,,195,195,195,,195,,,195,,,,195,,195,195',
+',,,195,195,31,31,31,31,,,31,31,,,,,,,,,31,,,,,,,,31,31,31,,31,,,31,',
+',,31,,31,31,,,,31,31,88,88,88,88,,,88,88,,,,,,,,,88,,,,,,,,88,88,88',
+',88,,,88,,,,88,,88,88,,,,88,88,107,107,107,107,,,107,107,,,,,,,,,107',
+',,,,,,,107,107,107,,107,,,107,,,,107,,107,107,,,,107,107,35,35,35,35',
+',,35,35,,,,,,,,,35,,,,,,,,35,35,35,,35,,,35,,,,35,,35,35,,,,35,35,193',
+'193,193,193,,,193,193,,,,,,,,,193,,,,,,,,193,193,193,,193,,,193,,,,193',
+',193,193,,,,193,193,111,111,111,111,,,111,111,,,,,,,,,111,,,,,,,,111',
+'111,111,,111,,,111,,,,111,,111,111,,,,111,111,190,190,190,190,,,190',
+'190,,,,,,,,,190,,,,,,,,190,190,190,,190,,,190,,,,190,,190,190,,190,',
+'190,190,106,106,106,106,,,106,106,,,,,,,,,106,,,,,,,,106,106,106,,106',
+',,106,,,,106,,106,106,,,,106,106,105,105,105,105,,,105,105,,,,,,,,,105',
+',,,,,,,105,105,105,,105,,,105,,,,105,,105,105,,,,105,105,44,44,44,44',
+',,44,44,,,,,,,,,44,,,,,,,,44,44,44,,44,,,44,,,,44,,44,44,,,,44,44,184',
+'184,184,184,,,184,184,,,,,,,,,184,,,,,,,,184,184,184,,184,,,184,,,,184',
+',184,184,,184,,184,184,47,47,47,47,,,47,47,,,,,,,,,47,,,,,,,,47,47,47',
+',47,,,47,,,,47,,47,47,,,,47,47,103,103,103,103,,,103,103,,,,,,,,,103',
+',,,,,,,103,103,103,,103,,,103,,,,103,,103,103,,,,103,103,113,113,113',
+'113,,,113,113,,,,,,,,,113,,,,,,,,113,113,113,,113,,,113,,,,113,,113',
+'113,,,,113,113,130,130,130,130,,,130,130,,,,,,,,,130,,,,,,,,130,130',
+'130,,130,,,130,,,,130,,130,130,,130,,130,130,137,137,137,137,,,137,137',
+',,,,,,,,137,,,,,,,,137,137,137,,137,,,137,,,,137,,137,137,,,,137,137',
+'97,97,97,97,,,97,97,,,,,,,,,97,,,,,,,,97,97,97,,97,,,97,,,,97,,97,97',
+',,,97,97,96,96,96,96,,,96,96,,,,,,,,,96,,,,,,,,96,96,96,,96,,,96,,,',
+'96,,96,96,,,,96,96,95,95,95,95,,,95,95,,,,,,,,,95,,,,,,,,95,95,95,,95',
+',,95,,,,95,,95,95,,,,95,95,94,94,94,94,,,94,94,,,,,,,,,94,,,,,,,,94',
+'94,94,,94,,,94,,,,94,,94,94,,,,94,94,77,77,77,77,,,77,77,,,,,,,,,77',
+',,,,,,,77,77,77,,77,,,77,,,,77,,77,77,,,,77,77,1,1,1,1,,,1,1,,,,,,,',
+',1,,,,,,,,1,1,1,,1,,,1,,,,1,,1,1,,,,1,1,91,91,91,91,,,91,91,,,,,,,,',
+'91,,,,,,,,91,91,91,,91,,,91,,,,91,,91,91,,,,91,91,90,90,90,90,,,90,90',
+',,,,,,,,90,,,,,,,,90,90,90,,90,,,90,,,,90,,90,90,,,,90,90,89,89,89,89',
+',,89,89,,,,,,,,,89,,,,,,,,89,89,89,,89,,,89,,,,89,,89,89,,,,89,89,83',
+'83,83,83,,,83,83,,,,,,,,,83,,,,,,,,83,83,83,,83,,,83,,,,83,,83,83,,',
+',83,83,85,85,85,85,,,85,85,,,,,,,,,85,,,,,,,,85,85,85,,85,,,85,,,,85',
+',85,85,,,,85,85,86,86,86,86,,,86,86,,,,,,,,,86,,,,,,,,86,86,86,,86,',
+',86,,,,86,,86,86,,,,86,86,194,194,194,194,,,194,194,,,,,,,,,194,,,,',
+',,,194,194,194,68,194,,,194,,,,194,,194,194,,,,194,194,,,68,68,68,68',
+'68,68,68,68,68,68,68,68,68,68,7,7,,,7,,,,,,7,7,,,99,,,,,7,7,7,7,7,7',
+'7,7,7,7,7,7,7,7,99,99,99,99,99,99,99,99,99,99,99,99,99,99,209,64,64',
+'64,64,64,64,64,64,64,,,,,109,,,,209,209,209,209,209,209,209,209,209',
+'209,209,209,209,209,209,109,109,109,109,109,109,109,109,109,109,109',
+'109,109,109,183,,,,,,,,,183,,,,,,,,,,183,183,183,183,183,183,183,183',
+'183,183,183,183,183,183,189,189,,,189,,,,,189,189,189,,,,,,,,189,189',
+'189,189,189,189,189,189,189,189,189,189,189,189' ]
+racc_action_check = arr = Array.new(2114, nil)
 str = a = i = nil
 idx = 0
 clist.each do |str|
@@ -841,122 +843,124 @@ clist.each do |str|
 end
 
 racc_action_pointer = [
-   237,  1574,   301,   337,   nil,   nil,   283,  1915,   278,   nil,
-   nil,   nil,   nil,   299,   nil,   342,   171,   nil,   nil,   293,
-   386,   nil,   282,   229,   nil,   nil,   -22,    57,   606,   nil,
-   nil,   650,   nil,   nil,   694,    31,   296,   178,   229,   nil,
-   nil,   226,   202,   219,  1046,    -6,   nil,  1134,   nil,   165,
+   239,  1577,   339,   299,   nil,   nil,   171,  1918,   281,   nil,
+   nil,   nil,   nil,   258,   301,   111,   nil,   256,   nil,   389,
+   nil,   248,   nil,   nil,   nil,   nil,   220,   521,   nil,   218,
+   330,   653,   nil,   -22,   113,   785,   nil,   nil,   181,    31,
+   nil,   271,   177,   167,  1049,   nil,   139,  1137,   159,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   103,   nil,   nil,
-  1945,   nil,   148,   nil,  1882,   nil,    88,   nil,   nil,   nil,
-   nil,   nil,   nil,   120,   nil,   nil,   nil,   178,  1530,    51,
-   nil,   -13,    -8,    29,  1750,   nil,  1794,  1838,  1310,  1706,
-   nil,  1662,  1618,  1442,  1398,   nil,   nil,   nil,   111,   152,
-   163,  1882,   nil,  1222,  1178,   298,   562,   518,   430,  2010,
-   738,  1963,   870,   nil,  1002,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    93,    -2,   nil,   -24,   nil,   116,   nil,
-   nil,   nil,   307,   152,   nil,   204,   nil,   nil,    90,   -29,
-  1266,  1354,   100,    12,   nil,   nil,   nil,   163,    29,   nil,
-   200,   140,   nil,   305,    51,   nil,   nil,   nil,   nil,    40,
-   nil,   nil,   nil,   nil,   236,   268,   303,   281,   118,   258,
-   259,   255,    35,   nil,   nil,     2,    85,  2043,  1486,   nil,
-   nil,    48,   295,    87,   111,   nil,  1996,  1090,    46,   -19,
-   nil,   nil,   958,   914,   nil,    -9,   nil,   826,   782,   474,
-   nil,   nil,   nil,   nil,   241,   nil,   247,   266,   -26,   nil,
-   nil,   nil,   nil,   238,    33,   nil,  1930,   nil,   284,   -20,
-   nil,   nil,   175,   209,   nil,   -23,   nil,    47,   207,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   nil,  1947,   nil,   148,   nil,  1885,   nil,
+   nil,   nil,    65,   nil,   nil,    87,   289,  1533,    51,   nil,
+   270,   -23,    29,  1753,   nil,  1797,  1841,   nil,   697,  1709,
+  1665,  1621,   nil,   nil,  1489,  1445,  1401,  1357,   nil,  1932,
+   171,   152,   163,  1181,   nil,  1005,   961,   741,   477,  1979,
+   433,   873,   nil,  1225,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   207,   nil,     2,   nil,   nil,   108,   nil,
+  1269,   nil,   117,   149,   nil,   229,   295,  1313,   nil,   241,
+   nil,    26,   219,    -8,   174,   124,   nil,   nil,   nil,   216,
+    29,   nil,   228,   315,   306,   278,    88,   nil,   nil,   257,
+    51,   nil,   nil,   nil,    40,   nil,   nil,   nil,   nil,   197,
+   299,   239,   118,   nil,   nil,   156,   175,   -24,    -8,    83,
+   nil,   nil,    -2,  2012,  1093,   -26,   nil,    90,   -33,  2045,
+   917,   nil,   nil,   829,  1885,   609,   565,    93,   nil,   -24,
+   nil,    -9,   nil,   345,   nil,   nil,   nil,   nil,   nil,  1965,
+   nil,   nil,   nil,   242,   -19,   nil,   nil,   244,   nil,   nil,
+   250,   269,    41,   nil,    65,    78,    47,   nil,   nil,   -13,
+   nil,   nil,   nil,   nil,   210,   nil,   nil,   nil,   nil,   nil,
+   nil ]
 
 racc_action_default = [
-  -152,  -152,  -152,  -152,    -1,    -4,    -2,  -152,  -152,   -12,
-    -5,   -13,   -14,   -74,   -49,  -152,  -152,   -16,   -15,   -76,
-  -152,   -17,   -78,   -53,   -21,   -18,  -152,   -56,  -152,   -23,
-   -58,  -152,   -24,   -20,  -152,   -30,   -63,   -66,  -152,   -36,
-   -22,   -68,  -152,   -70,  -152,   -72,   -47,  -152,   -11,  -152,
-    -6,  -102,   -94,   -83,    -9,   -95,   -84,  -152,   -85,  -103,
-   -98,   -86,  -152,   -87,  -152,   -88,   -97,   -89,   -90,  -100,
-   -91,  -107,   -92,  -152,  -101,   -93,    -8,    -3,  -152,  -152,
-   -43,  -152,  -137,  -152,  -152,   -38,  -152,  -152,  -152,  -152,
-   -10,  -152,  -152,  -152,  -152,   -37,   -39,   -40,  -152,  -152,
-  -152,  -152,   -31,  -152,  -152,  -152,  -152,  -152,  -152,  -152,
-  -152,  -152,  -152,   -41,  -152,   -42,   239,  -104,  -120,  -105,
-   -99,  -106,  -108,  -152,  -122,  -109,  -152,  -112,  -111,  -113,
-   -96,    -7,   -73,  -152,   -19,  -152,  -138,  -139,  -141,  -140,
-  -152,  -152,   -75,   -77,   -50,   -51,   -52,   -79,  -152,   -57,
-   -54,   -55,   -27,   -34,  -152,   -32,   -35,   -28,   -29,  -152,
-   -62,   -59,   -60,   -61,   -64,   -65,  -152,  -152,   -67,  -152,
-   -69,   -71,  -152,  -124,  -125,  -121,  -110,  -152,  -152,   -44,
-  -148,  -152,  -152,  -133,  -127,  -129,  -152,  -152,  -142,  -152,
-  -144,   -48,  -152,  -152,   -26,  -152,   -25,  -152,  -152,  -152,
-  -114,  -123,  -126,  -135,  -134,  -119,  -152,  -152,  -152,  -116,
-  -143,  -149,  -132,  -152,  -140,  -131,  -152,  -150,  -152,  -152,
-  -146,  -145,   -81,   -82,   -33,  -152,   -80,  -152,  -152,  -117,
-  -118,  -115,  -130,  -128,  -151,  -147,   -45,   -46,  -136 ]
+  -154,  -154,  -154,  -154,    -1,    -4,    -2,  -154,  -154,   -14,
+    -5,   -15,   -16,   -72,  -154,  -154,   -18,   -74,   -49,  -154,
+   -19,   -76,   -51,   -23,   -20,   -17,   -78,  -154,   -25,   -80,
+   -55,  -154,   -22,  -154,   -58,  -154,   -60,   -26,  -154,   -32,
+   -24,   -65,  -154,   -68,  -154,   -38,   -70,  -154,  -154,   -13,
+    -6,  -103,   -96,   -85,  -104,   -97,   -86,  -154,   -87,   -11,
+  -105,   -88,   -89,   -90,  -100,   -91,  -154,   -92,  -154,   -93,
+  -102,   -94,  -154,  -109,   -95,    -8,    -3,  -154,  -154,   -45,
+  -154,  -154,  -139,  -154,   -40,  -154,  -154,   -39,  -154,  -154,
+  -154,  -154,   -41,   -12,  -154,  -154,  -154,  -154,   -42,  -154,
+  -154,  -154,  -154,  -154,   -33,  -154,  -154,  -154,  -154,  -154,
+  -154,  -154,   -43,  -154,   -44,   241,  -122,  -106,  -107,  -101,
+  -108,  -110,    -7,  -154,    -9,  -124,   -10,  -141,  -143,  -111,
+  -154,  -114,  -142,  -113,  -115,   -71,  -154,  -154,   -21,  -154,
+  -140,  -142,   -73,   -75,   -77,   -79,   -52,   -53,   -54,   -81,
+  -154,   -59,   -56,   -57,  -154,  -154,   -99,   -37,   -29,   -36,
+  -154,   -34,   -30,   -31,  -154,   -64,   -61,   -62,   -63,  -154,
+   -66,   -67,   -69,  -131,  -150,  -154,  -154,  -154,  -135,  -129,
+  -126,  -127,  -123,  -154,  -154,  -154,  -146,  -144,  -112,  -154,
+  -154,   -46,   -50,  -154,  -154,  -154,  -154,  -154,   -98,  -154,
+   -28,  -154,   -27,  -154,  -145,  -116,  -151,  -134,  -133,  -154,
+  -125,  -128,  -152,  -154,  -154,  -148,  -147,  -136,  -121,  -137,
+  -154,  -154,  -154,  -118,   -83,   -84,  -154,   -82,   -35,  -154,
+  -132,  -130,  -153,  -149,  -154,  -119,  -120,  -117,   -47,   -48,
+  -138 ]
 
 racc_goto_table = [
-    54,    26,   130,    66,   149,    85,   172,   155,   148,   176,
-   139,   136,    82,    95,   188,    50,    96,   181,    83,    97,
-   174,   206,   118,     6,   166,   170,   169,   121,   143,   113,
-   218,    77,   115,   160,   161,   162,   163,   150,   151,   164,
-   165,   147,   132,   171,   142,   120,   168,    80,   154,    76,
-   117,    73,   173,   207,   175,   117,   232,     8,   204,     4,
-   122,     3,   nil,   139,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   202,   144,   145,   146,    82,   nil,   nil,   nil,   nil,
-   nil,   133,   nil,   nil,   nil,   nil,    50,   nil,   nil,   188,
-   nil,   nil,   157,   158,    82,   181,   172,   176,   153,   nil,
-   nil,   159,   nil,   201,   224,    66,   nil,    66,   222,   223,
-   226,   214,   212,   nil,   148,   nil,   nil,   nil,   nil,   215,
-   nil,   nil,   nil,   nil,   nil,   nil,   191,   nil,   nil,   nil,
+    59,    33,    84,   161,    75,   126,   151,   176,   124,   141,
+    87,   188,    82,    80,    92,   140,   150,    50,    98,   175,
+   181,   154,   213,   187,   116,   142,     6,   112,   220,   143,
+   114,   169,   187,   120,    76,   175,   165,   166,   167,   168,
+   152,   153,   170,   171,   144,   145,   149,   135,   119,   172,
+   117,    79,   180,   160,    72,     8,   221,   182,   230,   117,
+   217,     4,     2,   nil,   nil,   121,   141,   nil,   nil,   nil,
+   nil,   nil,   146,   147,   148,    82,   136,   211,   188,   nil,
+   nil,   176,   nil,   199,   nil,   nil,   198,    50,   nil,   nil,
+   nil,   nil,   nil,   nil,   162,   163,   156,    82,   nil,   nil,
+   159,   nil,   nil,   164,   228,   nil,   156,   227,   208,   210,
+   nil,   207,   nil,   nil,   224,   225,   nil,   150,   nil,   nil,
+   192,   nil,   nil,   nil,   199,   nil,   nil,   nil,   nil,   nil,
+   185,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   189,   214,   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,
-   203,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   208,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   219,   nil,   nil,
-   nil,    82,   nil,   nil,   nil,   153,   nil,   225,   nil,   227,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   219,   nil,   214,   nil,   nil,   nil,   nil,   nil,
+   222,   nil,   nil,   nil,   nil,   226,   nil,   nil,    82,   nil,
+   nil,   159,   nil,   229,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   238 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   240 ]
 
 racc_goto_check = [
-     8,    10,    37,    36,    24,    19,    43,    16,    22,    45,
-    44,    52,    36,    19,    55,     5,    19,    54,    17,    19,
-    35,    47,    42,     3,    20,    27,    20,    42,    31,    19,
-    47,     3,    19,    23,    23,    23,    23,    21,    21,    25,
-    25,    32,    29,    28,    30,    38,    26,    18,    14,     7,
-     8,     6,    44,    48,    49,     8,    51,     4,    53,     2,
-    36,     1,   nil,    44,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    35,    19,    19,    19,    36,   nil,   nil,   nil,   nil,
-   nil,    17,   nil,   nil,   nil,   nil,     5,   nil,   nil,    55,
-   nil,   nil,     8,     8,    36,    54,    43,    45,    10,   nil,
-   nil,    10,   nil,    44,    16,    36,   nil,    36,    22,    22,
-    24,    44,    52,   nil,    22,   nil,   nil,   nil,   nil,    37,
-   nil,   nil,   nil,   nil,   nil,   nil,    19,   nil,   nil,   nil,
+    10,    12,    21,    18,     7,     9,    26,    44,     8,    45,
+    21,    46,     7,    19,    21,     8,    24,     5,    21,    54,
+    38,    22,    48,    55,    43,    30,     3,    21,    48,    31,
+    21,    22,    55,    43,     3,    54,    25,    25,    25,    25,
+    23,    23,    27,    27,    32,    33,    34,    29,    39,    28,
+    10,    20,    45,    16,     6,     4,    49,    50,    52,    10,
+    53,     2,     1,   nil,   nil,     7,    45,   nil,   nil,   nil,
+   nil,   nil,    21,    21,    21,     7,    19,    38,    46,   nil,
+   nil,    44,   nil,    45,   nil,   nil,     9,     5,   nil,   nil,
+   nil,   nil,   nil,   nil,    10,    10,     7,     7,   nil,   nil,
+    12,   nil,   nil,    12,    18,   nil,     7,    26,     9,    45,
+   nil,     8,   nil,   nil,    24,    24,   nil,    24,   nil,   nil,
+    21,   nil,   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,
+    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    10,    44,   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,
-     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,   nil,
-   nil,    36,   nil,   nil,   nil,    10,   nil,    10,   nil,    10,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    10,   nil,    12,   nil,   nil,   nil,   nil,   nil,
+    12,   nil,   nil,   nil,   nil,    12,   nil,   nil,     7,   nil,
+   nil,    12,   nil,    12,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     8 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10 ]
 
 racc_goto_pointer = [
-   nil,    61,    59,    23,    57,     9,    44,    42,    -7,   nil,
-     0,   nil,   nil,   nil,   -50,   nil,   -91,     2,    32,   -15,
-   -85,   -56,   -84,   -70,   -88,   -68,   -64,   -87,   -71,   -36,
-   -40,   -58,   -50,   nil,   nil,  -104,    -4,   -64,   -15,   nil,
-   nil,   nil,   -35,  -117,   -72,  -117,   nil,  -156,  -124,   -70,
-   nil,  -160,   -71,  -119,  -118,  -125 ]
+   nil,    62,    61,    26,    55,    11,    47,    -3,   -67,   -70,
+    -7,   nil,     0,   nil,   nil,   nil,   -47,   nil,   -97,    -2,
+    37,   -17,   -78,   -56,   -79,   -69,   -89,   -68,   -64,   -30,
+   -58,   -56,   -42,   -43,   -48,   nil,   nil,   nil,  -105,   -16,
+   nil,   nil,   nil,   -33,  -116,   -73,  -121,   nil,  -161,  -133,
+   -68,   nil,  -151,  -129,  -104,  -109 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,    10,   nil,   167,    18,     1,
-    81,     2,    32,    35,   nil,    39,   nil,   156,    46,    14,
-   nil,    23,    27,    30,   nil,    36,    37,    41,    43,    45,
-    13,    19,    22,    60,    62,    64,   183,   nil,    69,    71,
-    74,    51,   nil,   125,   126,   128,   129,   182,   nil,   nil,
-   184,   185,   nil,   nil,   137,   138 ]
+   nil,   nil,   nil,   nil,   nil,    10,   nil,   178,   nil,   nil,
+    25,     1,    81,     3,    37,    39,   nil,    45,   nil,   157,
+    18,    22,   nil,    30,    34,    36,   nil,    41,    43,    46,
+    13,    17,    21,    26,    29,   155,    64,    66,    68,    70,
+    73,    51,    54,   nil,   129,   132,   133,   134,   177,   nil,
+   nil,   179,   173,   nil,   127,   128 ]
 
 racc_token_table = {
  false => 0,
@@ -1126,7 +1130,9 @@ Racc_token_to_s_table = [
 'context',
 'dbc_condition',
 'context_name',
-'declaration',
+'specifier_qualifier_list',
+'abstract_declarator',
+'declarator',
 'identifier',
 'dbc_condition_start',
 'expression',
@@ -1152,11 +1158,10 @@ Racc_token_to_s_table = [
 'logical_and_expression',
 'logical_or_expression',
 'logical_xor_expression',
+'declaration',
 'primitive_type',
 'struct_or_union',
 'type_qualifier',
-'specifier_qualifier_list',
-'declarator',
 'primitive_type_specifier',
 'type_specifier',
 'struct_or_union_specifier',
@@ -1171,7 +1176,6 @@ Racc_token_to_s_table = [
 'type_qualifier_list',
 'parameter_list',
 'parameter_declaration',
-'abstract_declarator',
 'identifier_sequence',
 'abstract_declarator_sequence',
 'direct_abstract_declarator']
@@ -1221,28 +1225,43 @@ module_eval <<'.,.,', 'src/ocl.y', 54
   end
 .,.,
 
- # reduce 8 omitted
+module_eval <<'.,.,', 'src/ocl.y', 59
+  def _reduce_8( val, _values, result )
+ result = CType::Type.new(); result.base_type = val[0]
+   result
+  end
+.,.,
 
- # reduce 9 omitted
+module_eval <<'.,.,', 'src/ocl.y', 61
+  def _reduce_9( val, _values, result )
+ result = val[1]; result.base_type = val[0]
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 64
+module_eval <<'.,.,', 'src/ocl.y', 63
   def _reduce_10( val, _values, result )
+ result = val[1]; result.base_type = val[0]
+   result
+  end
+.,.,
+
+ # reduce 11 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 69
+  def _reduce_12( val, _values, result )
  val[0].condition = val[1]; result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 68
-  def _reduce_11( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 73
+  def _reduce_13( val, _values, result )
  result = Condition.new(val[0], val[1])
    result
   end
 .,.,
 
- # reduce 12 omitted
-
- # reduce 13 omitted
-
  # reduce 14 omitted
 
  # reduce 15 omitted
@@ -1253,162 +1272,157 @@ module_eval <<'.,.,', 'src/ocl.y', 68
 
  # reduce 18 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 82
-  def _reduce_19( val, _values, result )
- result = Paren.new(val[1])
-   result
-  end
-.,.,
+ # reduce 19 omitted
 
  # reduce 20 omitted
 
 module_eval <<'.,.,', 'src/ocl.y', 87
   def _reduce_21( val, _values, result )
- result = 'ocl__ret_val'
+ result = Paren.new(val[1])
    result
   end
 .,.,
 
  # reduce 22 omitted
 
- # reduce 23 omitted
+module_eval <<'.,.,', 'src/ocl.y', 92
+  def _reduce_23( val, _values, result )
+ result = 'ocl__ret_val'
+   result
+  end
+.,.,
 
  # reduce 24 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 101
-  def _reduce_25( val, _values, result )
+ # reduce 25 omitted
+
+ # reduce 26 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 106
+  def _reduce_27( val, _values, result )
  result = val[0,4].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 102
-  def _reduce_26( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 107
+  def _reduce_28( val, _values, result )
  result = val[0,4].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 103
-  def _reduce_27( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 108
+  def _reduce_29( val, _values, result )
  result = val[0,3].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 104
-  def _reduce_28( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 109
+  def _reduce_30( val, _values, result )
  result = val[0,3].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 105
-  def _reduce_29( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 110
+  def _reduce_31( val, _values, result )
  result = val[0,3].join
    result
   end
 .,.,
 
- # reduce 30 omitted
+ # reduce 32 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 110
-  def _reduce_31( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 115
+  def _reduce_33( val, _values, result )
  result = add_old(val[0].to_s)
    result
   end
 .,.,
 
- # reduce 32 omitted
+ # reduce 34 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 116
-  def _reduce_33( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 121
+  def _reduce_35( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
- # reduce 34 omitted
+ # reduce 36 omitted
 
- # reduce 35 omitted
+ # reduce 37 omitted
 
- # reduce 36 omitted
+ # reduce 38 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 127
-  def _reduce_37( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 132
+  def _reduce_39( val, _values, result )
  result = UAddrs.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 128
-  def _reduce_38( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 133
+  def _reduce_40( val, _values, result )
  result = UDeref.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 129
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 134
+  def _reduce_41( val, _values, result )
  result = UPlus.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 130
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 135
+  def _reduce_42( val, _values, result )
  result = UMinus.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 131
-  def _reduce_41( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 136
+  def _reduce_43( val, _values, result )
  result = Not.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 132
-  def _reduce_42( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 137
+  def _reduce_44( val, _values, result )
  result = UBitNot.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 133
-  def _reduce_43( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 138
+  def _reduce_45( val, _values, result )
  result = SizeOf.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 134
-  def _reduce_44( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 139
+  def _reduce_46( val, _values, result )
  result = val[0,4].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 136
-  def _reduce_45( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 141
+  def _reduce_47( val, _values, result )
  result = Forall.new(val[2], val[4])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 138
-  def _reduce_46( val, _values, result )
- result = Exists.new(val[2], val[4])
-   result
-  end
-.,.,
-
- # reduce 47 omitted
-
 module_eval <<'.,.,', 'src/ocl.y', 143
   def _reduce_48( val, _values, result )
- result = val[0,4].join(' ')
+ result = Exists.new(val[2], val[4])
    result
   end
 .,.,
@@ -1417,27 +1431,27 @@ module_eval <<'.,.,', 'src/ocl.y', 143
 
 module_eval <<'.,.,', 'src/ocl.y', 148
   def _reduce_50( val, _values, result )
- result = val[0,3].join(' ')
+ result = val[0,4].join(' ')
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 149
-  def _reduce_51( val, _values, result )
+ # reduce 51 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 153
+  def _reduce_52( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 150
-  def _reduce_52( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 154
+  def _reduce_53( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
- # reduce 53 omitted
-
 module_eval <<'.,.,', 'src/ocl.y', 155
   def _reduce_54( val, _values, result )
  result = val[0,3].join(' ')
@@ -1445,18 +1459,18 @@ module_eval <<'.,.,', 'src/ocl.y', 155
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 156
-  def _reduce_55( val, _values, result )
+ # reduce 55 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 160
+  def _reduce_56( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
- # reduce 56 omitted
-
-module_eval <<'.,.,', 'src/ocl.y', 162
+module_eval <<'.,.,', 'src/ocl.y', 161
   def _reduce_57( val, _values, result )
- result = val[2].test_expression(val[0])
+ result = val[0,3].join(' ')
    result
   end
 .,.,
@@ -1465,34 +1479,34 @@ module_eval <<'.,.,', 'src/ocl.y', 162
 
 module_eval <<'.,.,', 'src/ocl.y', 167
   def _reduce_59( val, _values, result )
- result = val[0,3].join(' ')
+ result = val[2].test_expression(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 168
-  def _reduce_60( val, _values, result )
+ # reduce 60 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 172
+  def _reduce_61( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 169
-  def _reduce_61( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 173
+  def _reduce_62( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 170
-  def _reduce_62( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 174
+  def _reduce_63( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
- # reduce 63 omitted
-
 module_eval <<'.,.,', 'src/ocl.y', 175
   def _reduce_64( val, _values, result )
  result = val[0,3].join(' ')
@@ -1500,15 +1514,15 @@ module_eval <<'.,.,', 'src/ocl.y', 175
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 176
-  def _reduce_65( val, _values, result )
+ # reduce 65 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 180
+  def _reduce_66( val, _values, result )
  result = val[0,3].join(' ')
    result
   end
 .,.,
 
- # reduce 66 omitted
-
 module_eval <<'.,.,', 'src/ocl.y', 181
   def _reduce_67( val, _values, result )
  result = val[0,3].join(' ')
@@ -1536,65 +1550,70 @@ module_eval <<'.,.,', 'src/ocl.y', 191
 
  # reduce 72 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 197
+module_eval <<'.,.,', 'src/ocl.y', 196
   def _reduce_73( val, _values, result )
- result = And.new(val[0], val[2])
+ result = val[0,3].join(' ')
    result
   end
 .,.,
 
  # reduce 74 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 203
+module_eval <<'.,.,', 'src/ocl.y', 202
   def _reduce_75( val, _values, result )
- result = Or.new(val[0], val[2])
+ result = And.new(val[0], val[2])
    result
   end
 .,.,
 
  # reduce 76 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 209
+module_eval <<'.,.,', 'src/ocl.y', 208
   def _reduce_77( val, _values, result )
- result = XOr.new(val[0], val[2])
+ result = Or.new(val[0], val[2])
    result
   end
 .,.,
 
  # reduce 78 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 215
+module_eval <<'.,.,', 'src/ocl.y', 214
   def _reduce_79( val, _values, result )
+ result = XOr.new(val[0], val[2])
+   result
+  end
+.,.,
+
+ # reduce 80 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 220
+  def _reduce_81( val, _values, result )
  result = Implies.new(val[0], val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 219
-  def _reduce_80( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 224
+  def _reduce_82( val, _values, result )
  result = IteratorRange.new(val[0], val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 225
-  def _reduce_81( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 230
+  def _reduce_83( val, _values, result )
  result = Range.new(val[0], val[2], false)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 227
-  def _reduce_82( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 232
+  def _reduce_84( val, _values, result )
  result = Range.new(val[0], val[2], true)
    result
   end
 .,.,
 
- # reduce 83 omitted
-
- # reduce 84 omitted
-
  # reduce 85 omitted
 
  # reduce 86 omitted
@@ -1617,91 +1636,95 @@ module_eval <<'.,.,', 'src/ocl.y', 227
 
  # reduce 95 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 257
-  def _reduce_96( val, _values, result )
+ # reduce 96 omitted
+
+ # reduce 97 omitted
+
+module_eval <<'.,.,', 'src/ocl.y', 262
+  def _reduce_98( val, _values, result )
  result = val[1]; result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 259
-  def _reduce_97( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 264
+  def _reduce_99( val, _values, result )
  result = CType::Type.new(); result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 264
-  def _reduce_98( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 269
+  def _reduce_100( val, _values, result )
  result = CType::Primitive.new(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 265
-  def _reduce_99( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 270
+  def _reduce_101( val, _values, result )
  result = val[1].insert(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 270
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 275
+  def _reduce_102( val, _values, result )
  result = CType::Base.new(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 271
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 276
+  def _reduce_103( val, _values, result )
  result = CType::Base.new(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 272
-  def _reduce_102( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 277
+  def _reduce_104( val, _values, result )
  result = CType::Base.new(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 273
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 278
+  def _reduce_105( val, _values, result )
  result = CType::Base.new(val[0])
    result
   end
 .,.,
 
- # reduce 104 omitted
+ # reduce 106 omitted
 
- # reduce 105 omitted
+ # reduce 107 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 283
-  def _reduce_106( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 288
+  def _reduce_108( val, _values, result )
  result = CType::StructUnion.get(val[0], val[1])
    result
   end
 .,.,
 
- # reduce 107 omitted
+ # reduce 109 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 290
-  def _reduce_108( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 295
+  def _reduce_110( val, _values, result )
  result = val[1]; result.add_qualifier(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 294
-  def _reduce_109( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 299
+  def _reduce_111( val, _values, result )
  result = val[0].first
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 309
-  def _reduce_110( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 314
+  def _reduce_112( val, _values, result )
 				# the base type of the last element in the declarator sequence
 				# is not a pointer.  that pointer points to a new type which is
 				# appended to the end of the declarator sequence
@@ -1712,203 +1735,203 @@ module_eval <<'.,.,', 'src/ocl.y', 309
   end
 .,.,
 
- # reduce 111 omitted
+ # reduce 113 omitted
 
- # reduce 112 omitted
+ # reduce 114 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 319
-  def _reduce_113( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 324
+  def _reduce_115( val, _values, result )
  result = [CType::Type.new(val[0])]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 321
-  def _reduce_114( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 326
+  def _reduce_116( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 323
-  def _reduce_115( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 328
+  def _reduce_117( val, _values, result )
  result = val[0]; result.last.dimensions << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 325
-  def _reduce_116( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 330
+  def _reduce_118( val, _values, result )
  result = val[0]; result.last.dimensions << nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 327
-  def _reduce_117( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 332
+  def _reduce_119( val, _values, result )
  result = val[0]; result.last.parameters = val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 329
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 334
+  def _reduce_120( val, _values, result )
  result = val[0]; result.last.parameters = val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 331
-  def _reduce_119( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 336
+  def _reduce_121( val, _values, result )
  result = val[0]; result.last.parameters = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 336
-  def _reduce_120( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 341
+  def _reduce_122( val, _values, result )
  result = CType::Enum[val[1]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 341
-  def _reduce_121( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 346
+  def _reduce_123( val, _values, result )
  result = CType::Pointer.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 343
-  def _reduce_122( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 348
+  def _reduce_124( val, _values, result )
  result = CType::Pointer.new()
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 349
-  def _reduce_123( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 354
+  def _reduce_125( val, _values, result )
 				result = val[2]
 				result.base_type = CType::Pointer.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 354
-  def _reduce_124( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 359
+  def _reduce_126( val, _values, result )
 				result = val[1]
 				result.base_type = CType::Pointer.new()
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 358
-  def _reduce_125( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 363
+  def _reduce_127( val, _values, result )
  result = val[0,1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 359
-  def _reduce_126( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 364
+  def _reduce_128( val, _values, result )
  result = val[0] << val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 364
-  def _reduce_127( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 369
+  def _reduce_129( val, _values, result )
  result = val[0].finalize
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 365
-  def _reduce_128( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 370
+  def _reduce_130( val, _values, result )
  result = val[0].with_ellipses
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 370
-  def _reduce_129( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 375
+  def _reduce_131( val, _values, result )
  result = CType::List.new << val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 371
-  def _reduce_130( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 376
+  def _reduce_132( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 377
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 382
+  def _reduce_133( val, _values, result )
  result = val[1]; result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 379
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 384
+  def _reduce_134( val, _values, result )
  result = val[1]; result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 381
-  def _reduce_133( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 386
+  def _reduce_135( val, _values, result )
  result = CType::Type.new(); result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 390
-  def _reduce_134( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 395
+  def _reduce_136( val, _values, result )
  result = val[0].finalize
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 395
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 400
+  def _reduce_137( val, _values, result )
  result = CType::List.new << val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 396
-  def _reduce_136( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 401
+  def _reduce_138( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 401
-  def _reduce_137( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 406
+  def _reduce_139( val, _values, result )
  result = CType::Type.new(); result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 403
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 408
+  def _reduce_140( val, _values, result )
  result = val[1]; result.base_type = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 408
-  def _reduce_139( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 413
+  def _reduce_141( val, _values, result )
  result = val[0].first
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 421
-  def _reduce_140( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 426
+  def _reduce_142( val, _values, result )
 				# create new type, example: int (*)(const char *, const char *)
 				result = [CType::Type.new(), CType::Type.new()]
 				result.first.base_type = val[0] # pointer to a
@@ -1917,10 +1940,10 @@ module_eval <<'.,.,', 'src/ocl.y', 421
   end
 .,.,
 
- # reduce 141 omitted
+ # reduce 143 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 429
-  def _reduce_142( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 434
+  def _reduce_144( val, _values, result )
 				# see direct_declarator for more info
 				result = val[1]
 				result.last.base_type = val[0]
@@ -1929,10 +1952,10 @@ module_eval <<'.,.,', 'src/ocl.y', 429
   end
 .,.,
 
- # reduce 143 omitted
+ # reduce 145 omitted
 
-module_eval <<'.,.,', 'src/ocl.y', 439
-  def _reduce_144( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 444
+  def _reduce_146( val, _values, result )
 				# create new type
 				result = [CType::Type.new()]
 				result.last.dimensions << nil
@@ -1940,8 +1963,8 @@ module_eval <<'.,.,', 'src/ocl.y', 439
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 445
-  def _reduce_145( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 450
+  def _reduce_147( val, _values, result )
 				# create new type
 				result = [CType::Type.new()]
 				result.last.dimensions << val[1]
@@ -1949,22 +1972,22 @@ module_eval <<'.,.,', 'src/ocl.y', 445
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 446
-  def _reduce_146( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 451
+  def _reduce_148( val, _values, result )
  result = val[0]; result.last.dimensions << nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 448
-  def _reduce_147( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 453
+  def _reduce_149( val, _values, result )
  result = val[0]; result.last.dimensions << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 455
-  def _reduce_148( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 460
+  def _reduce_150( val, _values, result )
 				# create new type
 				result = [CType::Type.new()]
 				result.last.parameters = nil
@@ -1972,8 +1995,8 @@ module_eval <<'.,.,', 'src/ocl.y', 455
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 461
-  def _reduce_149( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 466
+  def _reduce_151( val, _values, result )
 				# create new type
 				result = [CType::Type.new()]
 				result.last.parameters = val[2]
@@ -1981,15 +2004,15 @@ module_eval <<'.,.,', 'src/ocl.y', 461
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 462
-  def _reduce_150( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 467
+  def _reduce_152( val, _values, result )
  result = val[0]; result.last.parameters = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/ocl.y', 464
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'src/ocl.y', 469
+  def _reduce_153( val, _values, result )
  result = val[0]; result.last.parameters = val[2]
    result
   end