dbc 1.1.0 → 1.1.1

data/lib/dbc/define.rb

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

data/lib/dbc/ocl.rb

@@ -413,7 +413,7 @@ module OCL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end src/ocl.y modeval..id980a140244', 'src/ocl.y', 849
+module_eval <<'..end src/ocl.y modeval..id75b06ff026', 'src/ocl.y', 849
 
 	def Parser.reserved_word?(str)
 		(str =~ /\A(?:context|forall|exists|in|and|or|implies|not|xor)\Z/o) != nil
@@ -509,7 +509,7 @@ protected
 		t
 	end
 
-..end src/ocl.y modeval..id980a140244
+..end src/ocl.y modeval..id75b06ff026
 
 ##### 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..id8a18afcd01', 'src/parameters.y', 140
+module_eval <<'..end src/parameters.y modeval..id315b0f7ad9', '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..id8a18afcd01
+..end src/parameters.y modeval..id315b0f7ad9
 
 ##### racc 1.4.4 generates ###
 
@@ -118,83 +118,88 @@ racc_reduce_table = [
  1, 15, :_reduce_none,
  2, 15, :_reduce_8,
  1, 14, :_reduce_9,
- 3, 14, :_reduce_10,
+ 2, 14, :_reduce_10,
+ 1, 14, :_reduce_11,
+ 3, 14, :_reduce_12,
+ 2, 14, :_reduce_13,
  1, 17, :_reduce_none,
- 2, 17, :_reduce_12,
+ 2, 17, :_reduce_15,
  1, 18, :_reduce_none,
  1, 18, :_reduce_none,
- 2, 20, :_reduce_15,
- 2, 20, :_reduce_16,
- 3, 20, :_reduce_17,
- 3, 20, :_reduce_18,
+ 2, 20, :_reduce_18,
+ 2, 20, :_reduce_19,
+ 3, 20, :_reduce_20,
+ 3, 20, :_reduce_21,
  1, 21, :_reduce_none,
- 2, 21, :_reduce_20,
+ 2, 21, :_reduce_23,
  1, 22, :_reduce_none,
  1, 22, :_reduce_none,
  1, 22, :_reduce_none,
  1, 19, :_reduce_none,
- 1, 19, :_reduce_25,
+ 1, 19, :_reduce_28,
  1, 16, :_reduce_none,
  1, 16, :_reduce_none,
  1, 16, :_reduce_none ]
 
-racc_reduce_n = 29
+racc_reduce_n = 32
 
-racc_shift_n = 41
+racc_shift_n = 43
 
 racc_action_table = [
-    12,     3,     4,     6,    15,     9,    30,    20,    40,    12,
-     3,     4,     6,    15,    22,    30,    20,    35,    12,     3,
-     4,     6,    15,    25,    26,    20,    12,     3,     4,     6,
-    15,    18,   nil,    20,    12,     3,     4,     6,    15,    39,
-    30,    20,    12,     3,     4,     6,    15,    24,   nil,    20,
-    12,     3,     4,     6,    15,    36,    26,    20,    12,     3,
-     4,     6,    15,   nil,   nil,    20,    12,     3,     4,     6,
-    15,    28,    30,    20,     3,     4,     6,     8,     3,     4,
-     6,    11 ]
+    12,     3,     4,     6,    15,     9,    31,    21,    42,    12,
+     3,     4,     6,    15,    23,    31,    21,    37,    12,     3,
+     4,     6,    15,    25,    20,    21,    12,     3,     4,     6,
+    15,    18,    20,    21,    12,     3,     4,     6,    15,    41,
+    31,    21,    12,     3,     4,     6,    15,    38,    27,    21,
+    12,     3,     4,     6,    15,    26,    27,    21,    12,     3,
+     4,     6,    15,    29,    31,    21,    12,     3,     4,     6,
+    15,   nil,   nil,    21,    12,     3,     4,     6,    15,   nil,
+   nil,    21,    12,     3,     4,     6,    15,   nil,   nil,    21,
+     3,     4,     6,     8,     3,     4,     6,    11 ]
 
 racc_action_check = [
-    34,    34,    34,    34,    34,     1,    34,    34,    34,    20,
-    20,    20,    20,    20,     9,    20,    20,    20,    26,    26,
-    26,    26,    26,    13,    13,    26,     8,     8,     8,     8,
-     8,     8,   nil,     8,    32,    32,    32,    32,    32,    32,
-    32,    32,    11,    11,    11,    11,    11,    11,   nil,    11,
-    37,    37,    37,    37,    37,    23,    23,    37,    16,    16,
-    16,    16,    16,   nil,   nil,    16,    15,    15,    15,    15,
-    15,    15,    15,    15,     0,     0,     0,     0,     5,     5,
-     5,     5 ]
+    36,    36,    36,    36,    36,     1,    36,    36,    36,    21,
+    21,    21,    21,    21,     9,    21,    21,    21,    11,    11,
+    11,    11,    11,    11,    11,    11,     8,     8,     8,     8,
+     8,     8,     8,     8,    33,    33,    33,    33,    33,    33,
+    33,    33,    35,    35,    35,    35,    35,    24,    24,    35,
+    27,    27,    27,    27,    27,    13,    13,    27,    15,    15,
+    15,    15,    15,    15,    15,    15,    39,    39,    39,    39,
+    39,   nil,   nil,    39,    20,    20,    20,    20,    20,   nil,
+   nil,    20,    16,    16,    16,    16,    16,   nil,   nil,    16,
+     0,     0,     0,     0,     5,     5,     5,     5 ]
 
 racc_action_pointer = [
-    71,     5,   nil,   nil,   nil,    75,   nil,   nil,    24,    14,
-   nil,    40,   nil,    16,   nil,    64,    56,   nil,   nil,   nil,
-     7,   nil,   nil,    48,   nil,   nil,    16,   nil,   nil,   nil,
-   nil,   nil,    32,   nil,    -2,   nil,   nil,    48,   nil,   nil,
-   nil ]
+    87,     5,   nil,   nil,   nil,    91,   nil,   nil,    24,    14,
+   nil,    16,   nil,    48,   nil,    56,    80,   nil,   nil,   nil,
+    72,     7,   nil,   nil,    40,   nil,   nil,    48,   nil,   nil,
+   nil,   nil,   nil,    32,   nil,    40,    -2,   nil,   nil,    64,
+   nil,   nil,   nil ]
 
 racc_action_default = [
-    -1,   -29,    -2,   -26,   -27,   -29,   -28,    -7,   -29,   -29,
-    -8,   -29,   -24,   -29,   -25,   -29,    -9,   -11,    -5,   -13,
-   -29,   -14,    41,   -29,    -6,    -3,   -29,   -19,   -15,   -22,
-   -21,   -23,   -29,   -12,   -29,   -16,    -4,   -10,   -20,   -17,
-   -18 ]
+    -1,   -32,    -2,   -29,   -30,   -32,   -31,    -7,   -32,   -32,
+    -8,   -32,   -27,   -32,   -28,   -32,    -9,   -14,    -5,   -16,
+   -11,   -32,   -17,    43,   -32,    -6,    -3,   -13,   -22,   -18,
+   -25,   -24,   -26,   -32,   -15,   -10,   -32,   -19,    -4,   -12,
+   -23,   -20,   -21 ]
 
 racc_goto_table = [
-    33,    29,    32,     7,    37,    31,    29,    34,    10,    13,
-    31,    38,    23,    38,     5,     2,     1,   nil,    29,   nil,
-    29,    33,    31,   nil,    31 ]
+    34,    35,     7,    30,    32,    33,     5,    10,    39,    30,
+    32,    36,    13,    40,     2,    24,    40,     1,   nil,    34,
+   nil,    30,    32,    34,    30,    32 ]
 
 racc_goto_check = [
-     7,     8,    10,     5,     6,     9,     8,    10,     5,     3,
-     9,    11,     3,    11,     4,     2,     1,   nil,     8,   nil,
-     8,     7,     9,   nil,     9 ]
+     7,     6,     5,     8,     9,    10,     4,     5,     6,     8,
+     9,    10,     3,    11,     2,     3,    11,     1,   nil,     7,
+   nil,     8,     9,     7,     8,     9 ]
 
 racc_goto_pointer = [
-   nil,    16,    15,     1,    14,     3,   -22,   -16,   -14,   -10,
-   -13,   -21 ]
+   nil,    17,    14,     4,     6,     2,   -19,   -16,   -12,   -11,
+   -10,   -20 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,    14,    16,    17,    19,    21,
-   nil,    27 ]
+   nil,   nil,   nil,   nil,   nil,    14,    16,    17,    19,    22,
+   nil,    28 ]
 
 racc_token_table = {
  false => 0,
@@ -283,113 +288,134 @@ module_eval <<'.,.,', 'src/parameters.y', 18
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 19
+module_eval <<'.,.,', 'src/parameters.y', 20
   def _reduce_5( val, _values, result )
- result = []
+ result = ['']
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 20
+module_eval <<'.,.,', 'src/parameters.y', 21
   def _reduce_6( val, _values, result )
- result = []
+ result = ['']
    result
   end
 .,.,
 
  # reduce 7 omitted
 
-module_eval <<'.,.,', 'src/parameters.y', 25
+module_eval <<'.,.,', 'src/parameters.y', 26
   def _reduce_8( val, _values, result )
  result = val[0,2].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 29
+module_eval <<'.,.,', 'src/parameters.y', 30
   def _reduce_9( val, _values, result )
  result = val[0,1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 30
+module_eval <<'.,.,', 'src/parameters.y', 31
   def _reduce_10( val, _values, result )
- result = val[0] << val[2]
+ result = ['', val[1]]
    result
   end
 .,.,
 
- # reduce 11 omitted
+module_eval <<'.,.,', 'src/parameters.y', 32
+  def _reduce_11( val, _values, result )
+ result = ['']
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 35
+module_eval <<'.,.,', 'src/parameters.y', 33
   def _reduce_12( val, _values, result )
- result = val[0,2].join
+ result = val[0] << val[2]
    result
   end
 .,.,
 
- # reduce 13 omitted
+module_eval <<'.,.,', 'src/parameters.y', 34
+  def _reduce_13( val, _values, result )
+ result = result = val[0] << ''
+   result
+  end
+.,.,
 
  # reduce 14 omitted
 
-module_eval <<'.,.,', 'src/parameters.y', 44
+module_eval <<'.,.,', 'src/parameters.y', 39
   def _reduce_15( val, _values, result )
  result = val[0,2].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 45
-  def _reduce_16( val, _values, result )
+ # reduce 16 omitted
+
+ # reduce 17 omitted
+
+module_eval <<'.,.,', 'src/parameters.y', 48
+  def _reduce_18( val, _values, result )
+ result = val[0,2].join
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'src/parameters.y', 49
+  def _reduce_19( val, _values, result )
  result = val[0,2].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 46
-  def _reduce_17( val, _values, result )
+module_eval <<'.,.,', 'src/parameters.y', 50
+  def _reduce_20( val, _values, result )
  result = val[0,3].join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/parameters.y', 47
-  def _reduce_18( val, _values, result )
+module_eval <<'.,.,', 'src/parameters.y', 51
+  def _reduce_21( val, _values, result )
  result = val[0,3].join
    result
   end
 .,.,
 
- # reduce 19 omitted
+ # reduce 22 omitted
 
-module_eval <<'.,.,', 'src/parameters.y', 52
-  def _reduce_20( val, _values, result )
+module_eval <<'.,.,', 'src/parameters.y', 56
+  def _reduce_23( val, _values, result )
  result = val[0,2].join
    result
   end
 .,.,
 
- # reduce 21 omitted
+ # reduce 24 omitted
 
- # reduce 22 omitted
+ # reduce 25 omitted
 
- # reduce 23 omitted
+ # reduce 26 omitted
 
- # reduce 24 omitted
+ # reduce 27 omitted
 
-module_eval <<'.,.,', 'src/parameters.y', 66
-  def _reduce_25( val, _values, result )
+module_eval <<'.,.,', 'src/parameters.y', 70
+  def _reduce_28( val, _values, result )
  result = ' '
    result
   end
 .,.,
 
- # reduce 26 omitted
+ # reduce 29 omitted
 
- # reduce 27 omitted
+ # reduce 30 omitted
 
- # reduce 28 omitted
+ # reduce 31 omitted
 
  def _reduce_none( val, _values, result )
   result

data/lib/dbc/preprocessor.rb

@@ -226,7 +226,8 @@ protected
 						@cond_comp.pop
 				end # case
 			end #if
-			CTokenizer.create_newlines(start, self.line)
+			#CTokenizer.create_newlines(start, self.line)
+			[:SPACE, ''].freeze
 		end
 	end # Parser
 
@@ -237,7 +238,7 @@ module Preprocessor
 
   class StatementParser < Racc::Parser
 
-module_eval <<'..end src/preprocessor.y modeval..id1cfa2334fc', 'src/preprocessor.y', 605
+module_eval <<'..end src/preprocessor.y modeval..id0dc8e10bd3', 'src/preprocessor.y', 606
 
 	include Resolve
 
@@ -259,7 +260,7 @@ module_eval <<'..end src/preprocessor.y modeval..id1cfa2334fc', 'src/preprocesso
 		begin
 			do_parse
 		rescue ParseError
-			@preproc.error($!)
+			@source.error($!)
 		end
 	end
 
@@ -307,7 +308,7 @@ protected
 		CTokenizer::CPLexer.convert_token(t)
 	end
 
-..end src/preprocessor.y modeval..id1cfa2334fc
+..end src/preprocessor.y modeval..id0dc8e10bd3
 
 ##### racc 1.4.4 generates ###
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: dbc
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2004-10-29
+  version: 1.1.1
+date: 2004-11-01
 summary: Design by Contract (DBC) for C
 require_paths: 
   - lib
@@ -14,7 +14,7 @@ email: cmills@freeshell.org
 homepage: http://dbc.rubyforge.org
 rubyforge_project: dbc
 description: 
-autorequire: dbcparse
+autorequire: 
 default_executable: dbcparse.rb
 bindir: bin
 has_rdoc: false