sfp 0.4.2 → 0.4.4

data/lib/sfp/Sfplib.rb

@@ -14,10 +14,10 @@ module Sfp
 		end
 
 		def finalize
-			@root.keys.each { |k|
-				next if k[0,1] == '_' or !@root[k].is_a?(Hash)
-				@root.delete(k) if @root[k]['_context'] == 'abstract'
-			}
+			#@root.keys.each { |k|
+			#	next if k[0,1] == '_' or !@root[k].is_a?(Hash)
+			#	@root.delete(k) if @root[k]['_context'] == 'abstract'
+			#}
 		end
 
 		def next_id
@@ -57,7 +57,7 @@ module Sfp
 			parser = Sfp::Parser.new({ :root_dir => @root_dir,
 			                           :home_dir => File.expand_path(File.dirname(filepath)),
 			                           :constraint_next_id => @constraint_next_id })
-			parser.parse(File.read(filepath))
+			parser.parse(File.read(filepath), {:keep_abstract => true})
 			parser.root.each_pair do |key,val|
 				if val.is_a?(Hash)
 					if val['_context'] == 'state' and @root.has_key?(key) and @root[key]['_context'] == 'state'

data/lib/sfp/parser.rb

@@ -4,6 +4,8 @@ class Sfp::Parser
 	# enable this class to process SFP into FDR (SAS+)
 	include Sfp::SasTranslator
 
+	AbstractEliminator = Sfp::Visitor::AbstractEliminator.new
+
 	attr_accessor :root_dir, :home_dir, :conformant
 	attr_reader :root, :constraint_next_id
 
@@ -19,7 +21,14 @@ class Sfp::Parser
 		@constraint_next_id = (params[:constraint_next_id] ? params[:constraint_next_id] : 0)
 	end
 
-	# @param string : a string in SFP language
+	#####
+	#
+	# @param   [String] : a string of specification in SFP language
+	# @options [Hash]
+	#
+	# @return  [Hash] : the result Hash
+	#
+	#####
 	def parse(string, options={})
 		lexer = SfpLang::Lexer.new(string)
 		tokens = ANTLR3::CommonTokenStream.new(lexer)
@@ -30,8 +39,10 @@ class Sfp::Parser
 		parser.sfp
 		@constraint_next_id = parser.constraint_next_id
 		@root = parser.root
+		parser.root.accept(AbstractEliminator) if not options[:keep_abstract]
 		@conformant = parser.conformant
 		@parser_arrays = parser.arrays
+		parser.root
 	end
 
 	def to_json(params={})
@@ -41,10 +52,8 @@ class Sfp::Parser
 	end
 
 	def self.parse_file(filepath, options={})
-		#homedir = File.expand_path(File.dirname(filepath))
 		options[:home_dir] = File.expand_path(File.dirname(filepath)) if !options[:home_dir]
-		parser = Sfp::Parser.new(options) #{:home_dir => homedir})
+		parser = Sfp::Parser.new(options)
 		parser.parse(File.read(filepath))
-		parser.root
 	end
 end

data/lib/sfp/visitors.rb

@@ -30,6 +30,13 @@ module Sfp
 			end
 		end
 
+		class AbstractEliminator
+			def visit(name, value, parent)
+				parent.delete(name) if value.is_a?(Hash) and value['_context'] == 'abstract'
+				true
+			end
+		end
+
 		class ParentGenerator
 			def visit(name, value, parent)
 				value['_parent'] = parent if value.is_a?(Hash)

data/src/SfpLang.g

@@ -189,7 +189,11 @@ object_schemata
 	;
 
 abstract_object
-	:	'abstract' object_def
+	:	{
+			@is_final = false
+			@now['_finals'] = [] if !@now.has_key? '_finals'
+		}
+		'abstract' object_def
 		{  @root[$object_def.id]['_context'] = 'abstract'  }
 	;
 
@@ -197,6 +201,7 @@ object_def returns [id]
 	:	ID { $id = $ID.text }
 		{
 			@use_template = false
+			@now['_finals'] = [] if !@now.has_key? '_finals'
 			@now['_finals'] << $ID.text if @is_final
 		}
 		('extends' path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr3
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sfp
-rubygems_version: 2.0.14
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: SFP Parser