gen-text 0.0.2 → 0.0.3

data/README.md

@@ -24,15 +24,33 @@ Here `file.g` is a file containing the grammar description which consists of the
     
     nonterminal3 = expr3 ;
     
-Nonterminals start from a letter or "\_" and may contain alphanumeric characters, "\_", "-" or ":".
+Nonterminals start from a letter or "\_" and may contain alphanumeric characters, "\_", "-" and ":".
 
 You may also use backquoted nonterminals:
     
     `nonterminal1` = expr1 ;
     
     `Nonterminal with arbitrary characters: [:|:]\/!` = expr2 ;
+
+Trailing ";" can be omitted:
+
+    nonterminal1 = expr1
+    
+    nonterminal2 = expr2
+    
+    nonterminal3 = expr3
+
+Also you may omit the left part in the first rule:
+
+    expr1
     
-You may use the following expressions in the right part:
+    nonterminal2 = expr2
+    
+    nonterminal3 = expr3
+
+### Expressions ###
+
+You may use the following expressions in the rules' right part:
 
 <table>
   <thead>
@@ -158,6 +176,18 @@ You may use the following expressions in the right part:
 
 TODO: Capture the generated output.
 
+### Alternate syntax ###
+
+You may use "<-" instead of "=":
+
+    nonterm1 <- expr1 ;
+    
+    nonterm2 <- expr2 ;
+
+and "/" instead of "|":
+
+    `simple choice` <- "a" / "b" ;
+
 Examples
 --------
 
@@ -166,5 +196,5 @@ See them in "sample" directory.
 Links
 -----
 
-- [Documentation](http://www.rubydoc.info/gems/gen-text/0.0.1)
+- [Documentation](http://www.rubydoc.info/gems/gen-text/0.0.3)
 - [Source code](https://github.com/LavirtheWhiolet/gen-text)

data/lib/gen_text/compile.rb

@@ -44,7 +44,7 @@ module GenText
     class Label
     end
     
-    Program = ASTNode.new :rules do
+    Grammar = ASTNode.new :first_expr, :rules do
       
       def to_vm_code
         rule_labels = {}; begin
@@ -55,7 +55,13 @@ module GenText
         end
         code =
           [
-            [:call, rule_labels[rules.first.name]],
+            *(
+              if first_expr then
+                first_expr.to_vm_code(Context.new(new_binding, rule_labels))
+              else
+                [[:call, rule_labels[rules.first.name]]]
+              end
+            ),
             [:halt],
             *rules.map do |rule|
               [
@@ -321,9 +327,13 @@ module GenText
     # ---- Syntax ----
     
     rule :start do
-      whitespace_and_comments and
+      whitespace_and_comments and grammar
+    end
+    
+    rule :grammar do
+      first_expr = opt { e = expr and opt {semicolon} and e } and
       rules = many { rule_definition } and
-      _(Program[rules])
+      _(Grammar[first_expr.first, rules])
     end
     
     rule :expr do
@@ -406,7 +416,7 @@ module GenText
       _{ c = code("{=") and _(GenCode[c]) } or
       _{ c = code("{?") and _(CheckCode[c]) } or
       _{ action_code } or
-      _{ n = nonterm and not_follows(:eq) and _(RuleCall[n]) } or
+      _{ n = nonterm and not_follows(:eq, :larrow) and _(RuleCall[n]) } or
       _{ gen_number } or
       _{ lparen and e = expr and rparen and e }
     end
@@ -422,7 +432,7 @@ module GenText
     end
     
     rule :rule_definition do
-      n = nonterm and (_{eq} or _{larrow}) and e = choice and semicolon and
+      n = nonterm and (_{eq} or _{larrow}) and e = choice and opt {semicolon} and
       _(RuleDefinition[n, e])
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gen-text
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: