dbc 1.2.1 → 1.2.2

data/bin/dbcparse.rb

@@ -42,7 +42,7 @@ opts = GetoptLong.new(
 	[ "--output",					"-o",		GetoptLong::REQUIRED_ARGUMENT ],
 	# cc compatibility options
 	[ "--define",					"-D",		GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--include",				"-I",		GetoptLong::REQUIRED_ARGUMENT ]
+	[ "--include",				"-I",		GetoptLong::OPTIONAL_ARGUMENT ]
 )
 
 # initialize with defaults
@@ -50,6 +50,7 @@ dest_file = nil
 src_file = nil
 search_path = SearchPath.new
 defines = []
+search_usr_include = true
 
 always_output = false
 check_level = nil
@@ -70,10 +71,15 @@ begin
 				end
 			when "--include"
 				# should support including file in the future
-				begin
-					search_path << arg
-				rescue
-					opts.error($!)
+				if arg
+					begin
+						search_path.unshift(arg)
+					rescue
+						opts.error($!)
+					end
+				else
+					# -I with no argument means don't search /usr/include
+					search_usr_include = false
 				end
 			when "--define"
 				unless arg =~ /\A([A-Za-z_]\w*)(?:\(([\w,\s]*)\))?(?:=(.*))?\Z/
@@ -168,12 +174,32 @@ else
 end
 
 ### Compatibility with various compilers ###
-search_path.unshift('/usr/include') if File.exists?('/usr/include')
-search_path.unshift(File.dirname(src_file)) if src_file
-# search for /usr/lib/gcc*/<system>/<version>/include
-Dir['/usr/lib/gcc*/*/*/include'].each do |gcc_inc|
-	search_path << gcc_inc if File.directory?(gcc_inc)
+
+# the following are added to the end of the search path
+if search_usr_include
+	if File.exists?('/usr/include')
+		search_path << '/usr/include'
+		# search for /usr/lib/gcc*/<system>/<version>/include
+		Dir['/usr/lib/gcc*/*/*/include'].each do |gcc_inc|
+			search_path << gcc_inc if File.directory?(gcc_inc)
+		end
+	else
+		if env_include = ENV['INCLUDE']
+			env_include.split(';').each do |p|
+				# any anci c installation should have stdlib.h or stdio.h
+				if File.exists?(File.join(p, 'stdlib.h'))
+					search_path << p
+				end
+			end # each
+		end
+	end # if File.exists?('/usr/include')
 end
+
+search_path_limited = search_path.dup
+# Add directory of file to the begining of the search_path
+# search_path_limited does not include the directory of the file being parsed
+search_path.unshift( src_file ? File.dirname(src_file) : '.' )
+
 case RUBY_PLATFORM
 	when /i[0-9]86|cygwin|mingw/
 		defines << ['__i386__', nil, nil]
@@ -181,8 +207,11 @@ case RUBY_PLATFORM
 		# experiance may vary :)
 		defines << ['__GLIBC_HAVE_LONG_LONG', nil, '1']
 		defines << ['__extension__', nil, ' ']
+		defines << ['__inline__', nil, ' ']
 	when /powerpc|darwin/
 		defines << ['__ppc__', nil, nil]
+	else
+		warn "unrecognized platform: #{RUBY_PLATFORM}"
 end
 # for gcc 3.4+ compatibility
 defines << ['__builtin_va_list', nil, 'int *']
@@ -191,9 +220,6 @@ defines << ['SHLIB_COMPAT', ['arg'], '(0)']
 defines << ['__STDC__', nil, '1']
 #############################################
 
-# included files
-includes = {}
-
 # Cache Tokens => Preprocessor => Parse OCL => Parse C Types
 # Cached tokens are output.
 if not docs and check_level == DBC::NONE
@@ -204,17 +230,10 @@ else
 			out_str = DBC.parse_docs(CTokenizer::Lexer.new(text, src_file))
 		elsif preprocess_only
 			out_str = ''
-			preproc = Preprocessor::Parser.new(text, src_file) do |f|
-				if inc_text = includes[f]
-					inc_text
-				else
-					begin
-						File.open(search_path.find(f)) { |in_f| includes[f] = in_f.read }
-					rescue ArgumentError
-						preproc.error($!)
-					end
-				end
-			end
+			preproc = Preprocessor::Parser.new( search_path,
+																					search_path_limited,
+																					text, src_file )
+			
 			defines.each { |d,p,v| preproc.define(d, p, v) }
 			preproc.each do |t|
 				out_str << t[1]
@@ -224,20 +243,10 @@ else
 			# cache statements
 			cache = DBC::Cache.new(text, src_file)
 			# preprocesses all tokens
-			preproc = Preprocessor::Parser.new(cache) do |f|
-				# open included files
-				if inc_text = includes[f]
-					inc_text
-				else
-					begin
-						File.open(search_path.find(f)) { |in_f| includes[f] = in_f.read }
-					rescue ArgumentError
-						preproc.error($!)
-					end
-				end
-			end
+			preproc = Preprocessor::Parser.new(search_path, search_path_limited, cache)
+			
 			# define tokens passed
-			defines.each { |d,p,v| preproc.define(d, p, v) }
+			defines.each { |d| preproc.define(*d) }
 
 			# extracts DBC condtions
 			source = DBC::OCLParser.new(preproc)

data/lib/dbc/ctokenizer.rb

@@ -40,10 +40,10 @@ module CTokenizer
 		#FLOAT = %r(#{FLOAT_1}|#{FLOAT_2}|#{FLOAT_3})
 		FLOAT = %r(#{FLOAT_1}|#{FLOAT_2})
 
-		i_s = /[uU]?[lL]|[lL][uU]?/
-		INTEGER_1 = /0[xX][0-9a-fA-F]+#{i_s}?/
-		INTEGER_2 = /0[0-7]+#{i_s}?/
-		INTEGER_3 = /[0-9]+#{i_s}?/
+		i_s = /[uUlL]*/
+		INTEGER_1 = /0[xX][0-9a-fA-F]+#{i_s}/
+		INTEGER_2 = /0[0-7]+#{i_s}/
+		INTEGER_3 = /[0-9]+#{i_s}/
 		INTEGER = %r(#{INTEGER_1}|#{INTEGER_2}|#{INTEGER_3})
 	end # Expression
 
@@ -146,6 +146,7 @@ module CTokenizer
 				when m = scan(Expression::COMMENT)
 					@line += CTokenizer.line_count(m)
 					[:COMMENT, m]
+				# SYMBOL should come before INTEGER and FLOAT
 				when m = scan(Expression::SYMBOL)
 					[:SYMBOL, m]
 				when m = scan(Expression::NEWLINE)

data/lib/dbc/ctype.rb

@@ -69,7 +69,7 @@ module CType
 
 	def CType.[]=(val, new_val)
 		raise "expecting a String got #{val.class}" if val.class != String
-		raise "type #{val} already defined" if @@typedefs.include?(val)
+		raise ParseError, "type #{val} already defined" if @@typedefs.include?(val)
 		@@typedefs[val] = new_val
 	end
 
@@ -601,7 +601,7 @@ module CType
 
   class Parser < Racc::Parser
 
-module_eval <<'..end src/ctype.y modeval..idb337f077e4', 'src/ctype.y', 1137
+module_eval <<'..end src/ctype.y modeval..idcee92c23da', 'src/ctype.y', 1137
 
   def parse(str, file=nil, line=1)
     @tokens = CTokenizer::CLexer.new(str, file, line)
@@ -640,7 +640,7 @@ protected
 		t
   end
 
-..end src/ctype.y modeval..idb337f077e4
+..end src/ctype.y modeval..idcee92c23da
 
 ##### racc 1.4.4 generates ###
 

data/lib/dbc/define.rb

@@ -16,7 +16,7 @@ module Preprocessor
 
   class Define < Racc::Parser
 
-module_eval <<'..end src/define.y modeval..id2247533106', 'src/define.y', 75
+module_eval <<'..end src/define.y modeval..idbc0a52f69c', '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..id2247533106
+..end src/define.y modeval..idbc0a52f69c
 
 ##### 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..id459cfd0b09', 'src/ocl.y', 849
+module_eval <<'..end src/ocl.y modeval..ida1d027bef5', '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..id459cfd0b09
+..end src/ocl.y modeval..ida1d027bef5
 
 ##### 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..id1ab45e1c83', 'src/parameters.y', 144
+module_eval <<'..end src/parameters.y modeval..id008fb4e411', '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..id1ab45e1c83
+..end src/parameters.y modeval..id008fb4e411
 
 ##### racc 1.4.4 generates ###
 

data/lib/dbc/preprocessor.rb

@@ -118,22 +118,34 @@ module Preprocessor
 		end
 	end # Resolve
 
+	module FileMacro
+		def FileMacro.takes_args?; false end
+		def FileMacro.value(source); source.file.dup end
+	end
+
+	module LineMacro
+		def LineMacro.takes_args?; false end
+		def LineMacro.value(source); source.line.to_s end
+	end
+
 	class Parser < CTokenizer::LexerBase
 
 		include CTokenizer
 		include Resolve
 
-		def initialize(source, file=nil, line=1, &upon_include)
-			@upon_include = upon_include
+		def initialize(search_path, search_path_limited, source, file=nil, line=1)
 			if source.class <= String
 				source = CTokenizer::Lexer.new(source, file, line)
 			end
+
+			@search_path = search_path
+			@search_path_limited = search_path_limited
 			
 			@cond_comp = [true] # conditional compile is true at base
 		
 			@source = Tokens.new(source)
 			@macro_tokens = CTokenizer::Lexer.new('', file, line)
-			@defines = {}
+			@defines = { '__FILE__' => FileMacro, '__LINE__' => LineMacro }
 			@resolving = {}
 			
 			@parser = StatementParser.new(@defines)
@@ -190,7 +202,24 @@ module Preprocessor
 		end
 	
 protected
-		EMPTY_TOKEN = [:SPACE, ''].freeze
+		EMPTY_TOKEN = [:SPACE, ''.freeze].freeze
+
+		def include_file(file)
+			path = begin
+				if file =~ /\A"(.*)"\Z/
+					yield($1, @search_path)
+				elsif file =~ /\A<(.*)>\Z/
+					yield($1, @search_path_limited)
+				else
+					raise "impossible"
+				end
+			rescue ArgumentError
+				self.error($!)
+			end
+			str = File.open(path) { |f| f.read }
+			# could use *path* instead of *file* to give more info
+			@source.add_source( CTokenizer::Lexer.new(str, file) )
+		end
 
 		# @macro_tokens is empty when we parse a statement
 		def parse_statement
@@ -218,12 +247,13 @@ protected
 						self.undef(result[1])
 					when :INCLUDE
 						# note: we don't keep track of recursive includes
-						f = result[1]
-						str = @upon_include.call(f)
-						if str.class == String
-							str = CTokenizer::Lexer.new(str, f)
+						include_file(result[1]) do |f, search_path|
+							search_path.find(f)
+						end
+					when :INCLUDE_NEXT
+						include_file(result[1]) do |f, search_path|
+							search_path.find_next(f)
 						end
-						@source.add_source(str) if str
 					when :PRAGMA
 						# ignore
 					when :ERROR
@@ -259,10 +289,6 @@ protected
 						end # if
 					when :CLOSE
 						@cond_comp.pop
-					# for debugging
-					#when :IGNORE
-					#else
-					#	raise "impossible"
 				end # case
 
 				# eat rest of line unless token is a newline
@@ -283,7 +309,7 @@ module Preprocessor
 
   class StatementParser < Racc::Parser
 
-module_eval <<'..end src/preprocessor.y modeval..id895fa9d1fa', 'src/preprocessor.y', 708
+module_eval <<'..end src/preprocessor.y modeval..idb767efdc5e', 'src/preprocessor.y', 734
 
 	include Resolve
 
@@ -301,6 +327,14 @@ module_eval <<'..end src/preprocessor.y modeval..id895fa9d1fa', 'src/preprocesso
 		@defines.member?(t)
 	end
 
+	def file
+		@source.file
+	end
+
+	def line
+		@source.line
+	end
+
 	def parse_ignore(tokens, ignore_all)
 		@source = CTokenizer::CPLexer.new(tokens)
 
@@ -349,7 +383,7 @@ protected
 			@macro_tokens
 		end .scan(/.*?>/) # NOT multiline
 		raise ParseError, "expecting '>'" unless f
-		f.chop
+		"<#{f}"
 	end
 	
 	# next_ignore and next_ignore_all are used to output the first token
@@ -414,7 +448,7 @@ protected
 		t
 	end
 
-..end src/preprocessor.y modeval..id895fa9d1fa
+..end src/preprocessor.y modeval..idb767efdc5e
 
 ##### racc 1.4.4 generates ###
 
@@ -482,7 +516,7 @@ racc_reduce_table = [
  2, 67, :_reduce_60,
  1, 87, :_reduce_61,
  1, 87, :_reduce_62,
- 1, 88, :_reduce_63,
+ 1, 88, :_reduce_none,
  1, 88, :_reduce_64,
  2, 63, :_reduce_65,
  3, 63, :_reduce_66,
@@ -1569,7 +1603,7 @@ module_eval <<'.,.,', 'src/preprocessor.y', 150
 
 module_eval <<'.,.,', 'src/preprocessor.y', 155
   def _reduce_60( val, _values, result )
- result = val[0,2]; self.set_nonspace
+ result = val[0,2]
    result
   end
 .,.,
@@ -1588,12 +1622,7 @@ module_eval <<'.,.,', 'src/preprocessor.y', 166
   end
 .,.,
 
-module_eval <<'.,.,', 'src/preprocessor.y', 170
-  def _reduce_63( val, _values, result )
- val[0] =~ /\A"(.*)"\Z/; result = $1
-   result
-  end
-.,.,
+ # reduce 63 omitted
 
 module_eval <<'.,.,', 'src/preprocessor.y', 171
   def _reduce_64( val, _values, result )

data/lib/dbc/searchpath.rb

@@ -5,36 +5,54 @@
 
 class SearchPath
 	def SearchPath.check(p)
-		if !File.exists?(p) or !File.directory?(p)
-			raise "invalid search path: #{p}"
-		end
+		raise "invalid search path: #{p}" unless File.directory?(p)
 	end
 	def initialize
 		@paths = []
-	end
-	def add(path, check=true)
-		SearchPath.check(path)
-		@paths << path
+		@next_path = {}
 	end
 	def unshift(path)
 		SearchPath.check(path)
 		@paths.unshift(path)
 	end
 	def <<(path)
-		self.add(path)
+		SearchPath.check(path)
+		@paths << path
 	end
 
-	def check
+	def find(file)
+		raise ArgumentError, "'#{file}' not found" \
+			unless f = self.find_in(@paths, file)
+		f
+	end
+	def find_next(file)
+		if next_paths = @next_path[file]
+			f = self.find_in(next_paths, file)
+			return f if f
+		end
+		# start the search over
+		self.find(file)
+	end
+
+	def dup
+		d = SearchPath.new
 		@paths.each do |p|
-			SearchPath.check(p)
+			d << p
 		end
+		d
 	end
-	def find(file)
-		dir = @paths.find do |inc_dir|
-			File.exists?(File.join(inc_dir, file))
+
+protected
+	def find_in(paths, file)
+		paths.each_with_index do |dir, i|
+			path = File.join(dir, file)
+			if File.exists?(path)
+				i += 1
+				@next_path[file] = @paths[i, @paths.length - i]
+				return path
+			end
 		end
-		raise ArgumentError, "'#{file}' not found" unless dir
-		File.join(dir, file)
+		return nil
 	end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: dbc
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2004-11-05
+  version: 1.2.2
+date: 2004-11-10
 summary: Design by Contract (DBC) for C
 require_paths: 
   - lib