rubyang 0.1.1 → 0.1.2

data/lib/rubyang/model/parser/parser.y

@@ -442,6 +442,14 @@ rule
 							{
 								result = [val[0]]
 							}
+					|	"fraction-digits-stmt" "range-stmt"
+							{
+								result = [val[0], val[1]]
+							}
+					|	"range-stmt" "fraction-digits-stmt"
+							{
+								result = [val[1], val[0]]
+							}
 
 	"fraction-digits-stmt"		:	"fraction-digits-keyword" "fraction-digits-arg-str" "stmtend"
 							{
@@ -1433,7 +1441,7 @@ rule
 
 	"integer-value"			:	"string"
 							{
-								unless /^[1-9][0-9]*$/ =~ val[0]
+								unless /^[0-9]|[1-9][0-9]+$/ =~ val[0]
 									raise ParseError, "bad integer-value, but '#{val[0]}'"
 								end
 								result = val[0]

data/lib/rubyang/model/parser.rb

@@ -129,18 +129,22 @@ module Rubyang
 
 				scanre = Regexp.union( scanre_list.map{ |scanre| scanre[1] } )
 
+				next_to_kw = false
 				until s.eos?
 					token = s.scan( scanre )
 					#p token
 					case token
-					when scanres["slcomment"] then ;
-					when scanres["blcomment"] then ;
+					when scanres["slcomment"] then
+						;
+					when scanres["blcomment"] then
+						;
 					when scanres["dqstr"] then
 						token_ = token.gsub(/^"/,'').gsub(/"$/,'').gsub(/\\n/,"\n").gsub(/\\t/,"\t").gsub(/\\"/,"\"").gsub(/\\\\/,"\\")
 						#if 0 == (token_ =~ URI.regexp)
 							#@tokens.push [:URI, token_]
 						#else
 						@tokens.push [:STRING, token_]
+						next_to_kw = false
 						#end
 					when scanres["sqstr"] then
 						token_ = token.gsub(/^'/,'').gsub(/'$/,'')
@@ -149,24 +153,50 @@ module Rubyang
 						#else @tokens.push [:STRING, token_]
 						#end
 						@tokens.push [:STRING, token_]
+						next_to_kw = false
 					when scanres["nqstr"] then
-						case token
-						when *(keywords.values) then @tokens.push [keywords.key(token), token]
-						else @tokens.push [:STRING, token]
+						if (! next_to_kw) and keywords.values.include?(token)
+							@tokens.push [keywords.key(token), token]
+							next_to_kw = true
+						else
+							@tokens.push [:STRING, token]
+							next_to_kw = false
 						end
-					when scanres["+"]  then @tokens.push ["+", token]
-					when scanres[";"]  then @tokens.push [";", token]
-					when scanres[":"]  then @tokens.push [":", token]
-					when scanres["/"]  then @tokens.push ["/", token]
-					when scanres["|"]  then @tokens.push ["|", token]
-					when scanres[".."] then @tokens.push ["..", token]
-					when scanres["="]  then @tokens.push ["=", token]
-					when scanres["{"]  then @tokens.push ["{", token]
-					when scanres["}"]  then @tokens.push ["}", token]
-					when scanres["wsp"] then ;#@tokens.push [:WSP, token]
-					when scanres["newline"] then ;#@tokens.push [:NEWLINE, token]
-					when scanres["return"] then ;#@tokens.push [:RETURN, token]
-					else raise "token not match to any scanres: #{token.inspect}"
+					when scanres["+"] then
+						@tokens.push ["+", token]
+						next_to_kw = false
+					when scanres[";"] then
+						@tokens.push [";", token]
+						next_to_kw = false
+					when scanres[":"] then
+						@tokens.push [":", token]
+						next_to_kw = false
+					when scanres["/"] then
+						@tokens.push ["/", token]
+						next_to_kw = false
+					when scanres["|"] then
+						@tokens.push ["|", token]
+						next_to_kw = false
+					when scanres[".."] then
+						@tokens.push ["..", token]
+						next_to_kw = false
+					when scanres["="] then
+						@tokens.push ["=", token]
+						next_to_kw = false
+					when scanres["{"] then
+						@tokens.push ["{", token]
+						next_to_kw = false
+					when scanres["}"] then
+						@tokens.push ["}", token]
+						next_to_kw = false
+					when scanres["wsp"] then
+						; #@tokens.push [:WSP, token]
+					when scanres["newline"] then
+						; #@tokens.push [:NEWLINE, token]
+					when scanres["return"] then
+						; #@tokens.push [:RETURN, token]
+					else
+						raise "token not match to any scanres: #{token.inspect}"
 					end
 				end
 

data/lib/rubyang/model.rb

@@ -62,7 +62,7 @@ module Rubyang
 				}
 				# raise if received susstatements does not satisfy defined substatements' cardinality
 				self.substatements.each{ |k, v|
-					unless v.include? substmts.select{ |s| StmtMap.find( s ).intern == k }.size
+					unless v.include? substmts.count{ |s| StmtMap.find( s ).intern == k }
 						raise ArgumentError, "substatement #{StmtMap.find( k )} is not in #{self.class} #{k}'s cardinality"
 					end
 				}
@@ -74,6 +74,13 @@ module Rubyang
 				}
 				@substmts = substmts
 			end
+			def to_s parent=true
+				head, vars, tail = "#<#{self.class.to_s}:0x#{(self.object_id << 1).to_s(16).rjust(14,'0')} ", Array.new, ">"
+				if parent
+					vars.push "@substmts=#{@substmts.map{|s| s.to_s(false)}}"
+				end
+				head + vars.join(', ') + tail
+			end
 			def substmt substmt, strict: false
 				raise TypeError unless String === substmt
 				if strict
@@ -141,6 +148,14 @@ module Rubyang
 					raise ArgumentError, "Invalid Argument: '#{arg}'"
 				end
 			end
+			def to_s parent=true
+				head, vars, tail = "#<#{self.class.to_s}:0x#{(self.object_id << 1).to_s(16).rjust(14,'0')} ", Array.new, ">"
+				if parent
+					vars.push "@arg=#{@arg.to_s}"
+					vars.push "@substmts=#{@substmts.map{|s| s.to_s(false)}}"
+				end
+				head + vars.join(', ') + tail
+			end
 			def arg
 				@arg
 			end

data/lib/rubyang/version.rb

@@ -1,3 +1,3 @@
 module Rubyang
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end