minival_refi 0.0.1 → 0.1.0

data/lib/minival_refi.rb

@@ -2,13 +2,11 @@
 
 require 'polyglot'
 require 'treetop'
+require 'pp'
+require 'string_extensions_refi'
 
-#mg_path = File.join(File.dirname(__FILE__),'/minival_grammar.treetop')
-#Treetop.load(mg_path)
-
-Treetop.load('minival_refi/minival_grammar.treetop'
-
-#module Minival
+mg_path = File.join(File.dirname(__FILE__),'/minival_refi/minival_grammar.treetop')
+Treetop.load(mg_path)
 
 # extending the MinivalGrammarParser a little
 class MinivalGrammarParser
@@ -17,32 +15,43 @@ class MinivalGrammarParser
 	end
 end
 
+
 class Minival
-	#@@parser = MinivalGrammarParser.new
+
 	def initialize(minival_str)
 		@parser = MinivalGrammarParser.new
 		@parse_result = @parser.parse(minival_str)
 		@val = nil
 	end
-	def valid
-		return true if @parse_result
-		return false
+
+	def is_valid
+    if @parse_result
+      return true
+    else
+      return false
+    end
 	end
+
 	def assert_valid
-		unless valid	
-			report_errors
-      # TODO
-			#dperr 777,'Minival assert_valid failed'
+		if is_valid()	
+      return @get_value
+    else
+			report_errors()
+      return nil
 		end
 	end
-	def report_errors
-		pp @parser.get_errors
+
+	def report_errors()
+		pp @parser.get_errors()
 	end
-	def compute_val
-		@val = @parse_result.content
+
+	def compute_val()
+		@val = @parse_result.content()
 	end
-	def get_value
-		return @val || compute_val
+
+	def get_value()
+		return @val || compute_val()
 	end
+
 end
 

data/lib/minival_refi/minival_grammar.treetop

@@ -83,7 +83,7 @@ grammar MinivalGrammar
 	rule str_inner
  		( ( ( "\\\\" )* "\\\"") / !'"' . )* {
 			def content
-				return text_value.unescape_c_str
+				return text_value.unescape_c_string
 			end
 		}
 	end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Robert Fey
@@ -47,6 +47,21 @@ dependencies:
         version: 1.4.9
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: string_extensions_refi
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id003
 description: |-
   supports: nil, string, integer, array, hash
     the syntax is similar to to ruby