story-gen 0.0.6 → 0.1.0

data/NEWS

@@ -0,0 +1,13 @@
+0.1.0:
+  "-m" or "--allow-comma-in-facts" is removed
+  Comma (",") in Facts is always allowed
+  $DEBUG variable is considered in Parse
+  Some bugs fixed
+  "Either" statement is changed
+  Dot (".") is now allowed at the end of the story only
+  "If" statement syntax is completely rewritten
+  No more commas in "times", "while", "for all" statements
+  Alternate form of compound statement (with "-") is removed
+
+0.0.4:
+  Like, first release

data/README.md

@@ -55,7 +55,7 @@ A story is based on Facts. To state a Fact just write it:
 
     "John" loves "Liza"
 
-In the Fact expression you may use english and russian words (except keywords, see below), characters from "#№@$%/-", integer numbers (e.g., `18`) and arbitrary double- or single-quoted strings (`"..."` or `'...'`). Trailing commas are ignored (`xxx yyy zzz,` is the same as `xxx yyy zzz`). The words are case-insensitive (so `loves` and `Loves` mean the same), quoted strings are case-sensitive (so `"John"`≠`"JOHN"`).
+In the Fact expression you may use english and russian words (except keywords, see below), characters from "#№@$%/-,[]{}", integer numbers (e.g., `18`) and arbitrary double- or single-quoted strings (`"..."` or `'...'`). Trailing commas are ignored (`xxx yyy zzz,` is the same as `xxx yyy zzz`). The words are case-insensitive (so `loves` and `Loves` mean the same), quoted strings are case-sensitive (so `"John"`≠`"JOHN"`).
 
 Let's state some Facts:
 
@@ -77,7 +77,11 @@ What can Facts be used for? You may form conditions with them:
 
     If X is a boy then "Let's meet " X;
 
-Here `X` is a variable. Variable names consist of underscores ("_") and capital letters only (e.g., `LONG_VARIABLE_NAME`). You may only capture quoted strings or numbers as variables, so the following condition is invalid:
+Or, with a comma (",") before `then`:
+
+    If X is a boy, then "Let's meet " X;
+
+Here `X` is a variable. Variable names consist of underscores ("_") and capital letters only (e.g., `LONG_VARIABLE_NAME`). You may only capture quoted strings or numbers as variables, so the following is invalid:
 
     If "John" A "Liza" then ...  /* ERROR! */
 
@@ -107,47 +111,45 @@ Not all combinations of `and`, `or` and `not` are available, though. Use common
 
     If X is not a boy then "How can I determine "X"?"  /* ERROR! */
 
+<!-- TODO: Allow `not` in top-level but disallow to capture variables from it. -->
 You may also compare variables in the condition:
 
-    If X is a boy and Y is a boy and X != Y then
+    If X is a boy and Y is a boy and X <> Y then
       X" and "Y" are two different boys!"
 
 There are limitations on the comparison: the comparison must be after the `and` keyword and all variables must be mentioned in the left part of `and`.
 
-You may use `=`, `!=`, `<>`, `<=`, `<`, `>` and `>=` as comparison operators. Take types of the comparands into account, though!
+You may use `=`, `!=`, `<>`, `=/=`, `<=`, `<`, `>` and `>=` as comparison operators. Take types of the comparands into account, though!
 
 You may use asterisk ("*") instead of the variable to avoid capturing:
 
     If X is a boy and X not loves * then
       X" is a lonely boy."
 
-You may combine several `if`-s with `or` keyword:
+You may use `otherwise` keyword:
 
-    If X is a boy then
-      "We have found a boy "X"!"
-    or if Y is a girl then
-      "We have found a girl "Y"!"
+    If X is a boy and X not loves * then
+      X" is a lonely boy."
+    otherwise
+      X" has found someone!"
 
-Or combine `if`-s with some statement:
+You may combine several conditions and `then` statements using colon (":") and dashes ("-"):
 
-    If X is a boy then
-      "We know a boy "X"!"
-    or if Y is a girl then
-      "We know a girl "Y"!"
-    or
-      "We do not know anyone."
+    If:
+      - X is a boy then "We have found a boy "X;
+      - Y is a girl then "We have found a girl "Y;
+      - otherwise "We do not know anyone";
 
-This is like a classical `if ... else if ... else ...` but if multiple conditions are true then random one is chosen (instead of the first one, like in the classical `if-else`). The last `or` is the same as `else` in the classical `if-else` - it is chosen if all conditions are false.
+This is like a classical `if ... else if ... else ...` but if multiple conditions are true then the random one is chosen (instead of the first one, like in the classical `if-else`). The last `otherwise` is the same as `else` in the classical `if-else` - it is chosen if all other conditions are false.
 
-The full form of `if`:
+Look at the trailing semicolons (";") by the way - they resolve ambiguity!
 
-    If <condition> [,] then <statement> [,]
-    or if <condition> [,] then <statement> [,]
-    or if <condition> [,] then <statement> [,]
-    ...
-    or <statement>
+Another form of `if`:
 
-Here `[,]` means "optional comma".
+    If:
+      a) X is a boy then "We have found a boy "X;
+      b) Y is a girl then "We have found a girl "Y;
+      c) otherwise "We do not know anyone";
 
 You may use captured variables to state a Fact:
 
@@ -164,11 +166,11 @@ Set multiple Facts false:
     If X is a boy then
       X not loves *
 
-You may use the captured variables in another conditions (by prefixing them with hat "^"):
+You may use the captured variables in another conditions by prefixing them with hat ("^"):
 
     If X is a boy then
       if ^X loves * then "We found "X" which is in love!"
-      or "We found "X" which is stll single."
+      otherwise "We found "X" which is stll single."
 
 To combine several statements into one use a colon (":") with the final dot ("."):
 
@@ -186,38 +188,38 @@ or parentheses:
 There are other statements you can use:
 
 - "While":
-    
+  
   <pre><code>
-  While &lt;fact expression&gt; [,] &lt;statement&gt;
+  While &lt;fact expression&gt; &lt;statement&gt;
   </code></pre>
-
+  
   Here &lt;fact expression&gt; is the same as in `if` statement except that you may use `not` in top level:
   
   <pre><code>
   While X not loves *:
-    If X is a boy Y is a girl then X loves Y.
+    If X is a boy and Y is a girl then X loves Y.
   </code></pre>
-
-  The variables from &lt;fact expression&gt; are not available in &lt;statement&gt;
-
+  
+  The variables from &lt;fact expression&gt; are not available in &lt;statement&gt;.
+  
+  Note that usually there is no way to delimit &lt;fact expression&gt; from &lt;statement&gt; except by wrapping the &lt;statement&gt; into ":" and "." or into parentheses.
+  
 - "Repeat n times":
-    
+  
   <pre><code>
   10 times "Hello!"         (note: print "Hello!" 10 times)
-  10...20 times "Hello!"    (note: random number between 10 and 20 is
-                            chosen)
-  X times "Hello!"          (note: the value of the captured variable X
-                            is used)
+  10...20 times "Hello!"    (note: random number between 10 and 20 is chosen)
+  X times "Hello!"          (note: the value of the captured variable X is used)
   X...Y times "Hello!"      (note: the value between two captured variables
                             is used)
   </code></pre>
-    
+  
 - "For all":
-    
+  
   <pre><code>
-  For all &lt;fact expression&gt; [,] &lt;statement&gt;
+  For all &lt;fact expression&gt; &lt;statement&gt;
   </code></pre>
-    
+  
   &lt;statement&gt; is executed for all combinations of variables in &lt;fact expression&gt;. The &lt;fact expression&gt; is like in `if` statement.
   
 - Ruby code:
@@ -227,21 +229,24 @@ There are other statements you can use:
   </code></pre>
   
   Inside the code you can access the captured variables by their lowercase names:
-    
+  
   <pre><code>
   If X loves Y then
     ```puts(x); puts(y)```
   </code></pre>
-
+  
 - "Either ... or ...":
   
   <pre><code>
-  either &lt;statement&gt; [,]
-  or &lt;statement&gt; [,]
-  or &lt;statement&gt;
+  Either &lt;statement&gt; [;|,]
+  or &lt;statement&gt; [;|,]
+  or &lt;statement&gt; [;|,]
   ...
+  or &lt;statement&gt; [;|,]
   </code></pre>
-    
+  
+  `[;|,]` means optional character which is either semicolon (";") or comma (",").
+  
   A random &lt;statement&gt; is chosen and executed.
 
 ### Notes ###
@@ -250,43 +255,15 @@ There are other statements you can use:
 
     (note: this is a comment (with nested parentheses)!)
 
-Top-level statements may also be delimited with dot ("."):
-
-    "John" is a boy.
-    "Sam" is a boy.
-    "Liza" is a girl.
-    "Sabrina" is a girl.
-    "John" loves "Liza".
-
-There is another form of the statements combination:
+You may end the story with a dot ("."):
 
-    if X is a boy then:
-      - "We know "X;
-      - X" is a good boy";
-      - X" is glad to meet you".
+    "John" loves "Liza";
+    "Sam" loves "Sophia".
 
 Keywords `if`, `either`, `or`, `for` (in `for all`) and `while` may start with a capital letter: `If`, `Either` etc.
 
 You may also use russian keywords! ;)
 
-### Mods ###
-
-When `-m` or `--allow-comma-in-facts` is passed to `story`, the optional comma in "while" and "for all" becomes disallowed:
-  
-    For all A, B, C loves D, "Love quadrangle!";   /* ERROR, ambiguity! */
-    For all A, B, C loves D: "Love quadrangle!".   /* OK */
-    For all A, B, C loves D ("Love quadrangle!");  /* OK too */
-  
-Trailing comma in Fact expression is ignored:
-    
-    For all X loves Y, ("Someone loves other one!")
-      /* is the same as */
-    For all X loves Y ("Someone loves other one!")
-
-    If (A loves B,) and (B loves C,) then ...
-      /* is the same as */
-    If (A loves B) and (B loves C) then ...
-
 Examples
 --------
 

data/bin/story

@@ -6,7 +6,6 @@ require 'story/samples_dir'
 $output_file = nil
 $input_file = nil
 $story_class_name = nil
-$allow_comma_in_facts = false
 $process = lambda do |story_class_code, output|
   # execute the story
   story_class = eval story_class_code
@@ -35,10 +34,6 @@ OptionParser.new do |opts|
                                 "instead of an anonymous class" do |name|
     $story_class_name = name
   end
-  opts.on "-m", "--allow-comma-in-facts", "Allow `,' in Fact expressions",
-                                          "(see `Mods' in README)" do
-    $allow_comma_in_facts = true
-  end
   opts.on "-r", "--show-relations", "Show relations mentioned in the story",
                                     "(useful for debug)" do
     $process = lambda do |story_class_code, output|
@@ -67,7 +62,7 @@ begin
     end
   story_class_code =
     begin
-      Story.compile(input_text, $input_file || "-", $allow_comma_in_facts)
+      Story.compile(input_text, $input_file || "-")
     rescue Parse::Error => e
       abort "error: #{e.pos.file}:#{e.pos.line+1}:#{e.pos.column+1}: #{e.message}"
     end

data/lib/parse.rb

@@ -17,6 +17,8 @@ class Parse
   # 
   # parses +text+.
   # 
+  # If $DEBUG == true then it prints {#rule} calls to stdout.
+  # 
   # @param [String] text
   # @param [String] file file the +text+ is taken from.
   # @raise [Parse::Error, IOError]
@@ -32,7 +34,7 @@ class Parse
     if r.nil? or not @text.eos? then
       if @most_probable_error
       then raise @most_probable_error
-      else raise Error.new(Position.new(@text.pos, @text), "syntax error")
+      else raise Error.new(Position.new(@text.pos, @text, @file), "syntax error")
       end
     end
     return r
@@ -195,7 +197,10 @@ class Parse
       old_rule_start_pos = @rule_start_pos
       @rule_start_pos = pos
       begin
-        instance_eval(&body)
+        if $DEBUG then STDERR.puts("#{pos.file}:#{pos.line+1}:#{pos.column+1}: entering rule :#{name}"); end
+        r = instance_eval(&body)
+        if $DEBUG then STDERR.puts("#{pos.file}:#{pos.line+1}:#{pos.column+1}: exiting rule :#{name} #{if r.nil? then "(with nil)" end}"); end
+        r
       ensure
         @rule_start_pos = old_rule_start_pos
       end

data/lib/story/compile.rb

@@ -21,16 +21,12 @@ class Story
   
   # @param [String] text
   # @param [String] file a file the +text+ is taken from.
-  # @param [Boolean] allow_comma_in_fact_expr_primary
   # @return [String] a {String} which {Kernel#eval}s to a {Class} which
   #   inherits {Story}.
   # @raise [Parse::Error]
-  def self.compile(text, file = "-", allow_comma_in_fact_expr_primary = false)
+  def self.compile(text, file = "-")
     #
-    c = Parse.new.
-      tap { |p| p.allow_comma_in_fact_expr_primary = allow_comma_in_fact_expr_primary }.
-      (text, file).
-      to_code
+    c = Parse.new.(text, file).to_code
     # 
     relation_id_to_var_arg_valuesss_var = Hash.new do |h, relation_id|
       h[relation_id] = "@#{INTERNAL_VAR_PREFIX}var_arg_valuesss#{h.size}"
@@ -336,7 +332,7 @@ class Story
     
   end
   
-  Statement::Or = ASTNode.new :substatements do
+  Statement::Either = ASTNode.new :substatements do
     
     def to_code
       code << "[\n" <<
@@ -510,7 +506,7 @@ class Story
         rb_op =
           case e2.op
           when "==", "!=", "<=", ">=", "<", ">" then e2.op
-          when "<>" then "!="
+          when "<>", "=/=" then "!="
           when "=" then "=="
           end
         with_var_args(
@@ -598,14 +594,6 @@ class Story
   # @!visibility private
   class Parse < ::Parse
     
-    # ---------------
-    # @!group Options
-    # ---------------
-    
-    # @return [Boolean] is "," in {#fact_expr_primary} allowed? Default is
-    #   false.
-    attr_accessor :allow_comma_in_fact_expr_primary
-    
     # --------------
     # @!group Syntax
     # --------------
@@ -613,13 +601,13 @@ class Story
     rule :start do
       no_errors { wsc } and
       ss = many {
-        s = statement and opt { _{ semicolon } or _{ dot } } and s
+        s = statement and opt{semicolon} and s
       } and
+      opt{dot} and
       Program[ss]
     end
     
     rule :statement do
-      _{ statement_or } or
       _{ statement_if } or
       _{ statement_while } or
       _{ statement_for_all } or
@@ -627,14 +615,28 @@ class Story
       _{ statement_code } or
       _{ statement_set_fact } or
       _{ statement_tell } or
-      _{ statement_compound }
+      _{ statement_compound } or
+      _{ statement_either }
     end
     
-    rule :statement_tell do
-      parts = many1 {
-        _{ string } or _{ newline } or _{ var }
+    rule :statement_either do
+      either and s1 = statement and opt_c_or_s and sn = many {
+        _or_ and s = statement and opt_c_or_s and s
       } and
-      _(Statement::Tell[parts])
+      if sn.empty?
+      then s1
+      else _(Statement::Either[[s1, *sn]])
+      end
+    end
+    
+    def opt_c_or_s
+      opt{ _{semicolon} or _{comma} }
+    end
+    
+    rule :statement_tell do
+      expect("\"smth\"") { no_errors {
+        e = fact_expr_primary_or_statement_tell and e.is_a?(Statement::Tell) and e
+      } }
     end
     
     rule :statement_set_fact do
@@ -642,44 +644,41 @@ class Story
     end
     
     rule :statement_if do
-      if_then = lambda {
-        _if_ and c = fact_expr and opt { comma } and _then_ and s = statement and [c, s]
-      }
-      or_delimiter = lambda {
-        opt { comma } and _or_
+      # single `then' form
+      _{
+        _if_ and c = fact_expr and opt{comma} and _then_ and s1 = statement and opt{semicolon} and
+        s2 = opt { otherwise and s = statement and opt{semicolon} and s } and
+        _(Statement::If[ [[c, s1]], s2.first ])
+      } or
+      # multiple `then' form
+      _{
+        _if_ and colon and c_and_sn = many {
+          (_{dash} or _{ word and rparen }) and c = fact_expr and opt{comma} and _then_ and s = statement and opt{semicolon} and [c, s]
+        } and
+        otherwise_s = opt {
+          otherwise and s = statement and opt{semicolon} and s
+        } and
+        _(Statement::If[c_and_sn, otherwise_s.first])
       }
-      #
-      c_and_s1 = if_then.() and
-      c_and_sn = many { or_delimiter.() and if_then.() } and
-      else_a = opt { or_delimiter.() and statement } and
-      _(Statement::If[[c_and_s1, *c_and_sn], else_a.first])
     end
     
     rule :statement_while do
-      _while_ and f = fact_expr and opt { comma } and s = statement and
+      _while_ and f = fact_expr and s = statement and
       _(Statement::While[f, s])
     end
     
     rule :statement_for_all do
-      _for_ and all and f = fact_expr and opt { comma } and s = statement and
+      _for_ and all and f = fact_expr and s = statement and
       _(Statement::ForAll[f, s])
     end
     
     rule :statement_n_times do
-      val = lambda {
-        _{ number } or _{ var }
-      }
+      val = lambda { _{number} or _{var} or _{above_var} }
       #
       range_begin = range_end = val.() and opt { ellipsis and range_end = val.() } and times and s = statement and
       _(Statement::NTimes[range_begin, range_end, s])
     end
     
-    rule :statement_or do
-      _or_ and s1 = statement and
-      ss = many { opt { comma } and _or_ and statement } and
-      Statement::Or[[s1, *ss]]
-    end
-    
     rule :statement_code do
       c = _code_ and
       act {
@@ -695,7 +694,7 @@ class Story
     rule :statement_compound do
       body = lambda {
         ss = many {
-          opt { dash } and s = statement and opt { semicolon } and s
+          s = statement and opt{semicolon} and s
         } and
         _(Statement::Compound[ss])
       }
@@ -737,37 +736,50 @@ class Story
     
     rule :fact_expr_select do
       #
-      operand = lambda { _{ var } or _{ value } or _{ above_var } }
+      operand = lambda { _{var} or _{value} or _{above_var} }
       #
       v1 = operand.() and op = comparison_op and v2 = operand.() and
       _(FactExpr::Select[v1, op, v2])
     end
     
     rule :fact_expr_primary do
-      allow_comma = allow_comma_in_fact_expr_primary
+      expect("Fact expression") { no_errors {
+        f = fact_expr_primary_or_statement_tell and f.is_a?(FactExpr) and f
+      } }
+    end
+    
+    rule :fact_expr_primary_or_statement_tell do
       relation_id = []
       args = []
       negated = false
       # 
       one_or_more {
-        _{ s = (_{dash} or _{other_char}) and act { relation_id << s } } or
-        _{ allow_comma and s = comma and act { relation_id << s } } or
+        _{ s = (_{dash} or _{other_char} or _{comma}) and act { relation_id << s } } or
         _{ a = asterisk and act { args << a; relation_id << :* } } or
         _{ _not_ and act { negated = !negated } } or
-        _{ v = value and act { args << v; relation_id << :* } } or
-        _{ v = var and act { args << v; relation_id << :* } } or
-        _{ v = above_var and act { args << v; relation_id << :* } } or
-        _{ w = word and act { relation_id << w.ru_downcase } }
+        _{ v = (_{value} or _{var} or _{above_var}) and act { args << v; relation_id << :* } } or
+        _{
+          w = (
+            _{ word } or
+            _{ _for_ and not_follows {all} } or
+            _{ all }
+          ) and
+          act { relation_id << w.ru_downcase }
+        }
       } and
       act { relation_id.chomp!(",") } and
-      # this is not a "statement_tell" and
-      not relation_id.all? { |p| p == :* } and
-      e = _(FactExpr::Primary[relation_id, args]) and
-      if negated then _(FactExpr::Not[e]); else e; end
+      if not negated and relation_id.all? { |p| p == :* } then
+        _(Statement::Tell[args])
+      else
+        e = _(FactExpr::Primary[relation_id, args])
+        if negated then e = _(FactExpr::Not[e]); end
+        e
+      end
     end
     
     rule :value do
       _{ string } or
+      _{ nl } or
       _{ number }
     end
     
@@ -779,6 +791,10 @@ class Story
     # @!group Lexical Analysis
     # ------------------------
     
+    begin
+      @@keyword_method_ids = []
+    end
+    
     # macro  
     def self.token(method_id, human_readable_description, &body)
       rule method_id do
@@ -797,6 +813,15 @@ class Story
       end
     end
     
+    # macro
+    def self.keyword(method_id, human_readable_description, check_regexp, &return_value_f)
+      return_value_f ||= lambda { |captured_string| captured_string }
+      @@keyword_method_ids.push(method_id)
+      token method_id, human_readable_description do
+        t = word_keyword_or_var and check_regexp === t and return_value_f.(t)
+      end
+    end
+    
     simple_token :lparen, "("
     simple_token :rparen, ")"
     simple_token :comma, ","
@@ -806,60 +831,34 @@ class Story
     simple_token :dash, "-"
     simple_token :ellipsis, "..."
     
+    keyword :_for_, "`for'", /^([Ff]or|[Дд]ля)$/
+    keyword :all, "`all'", /^(all|всех)$/
+    keyword :_while_, "`while'", /^([Ww]hile|[Пп]ока)$/
+    keyword :_if_, "`if'", /^([Ii]f|[Ее]сли)$/
+    keyword :_then_, "`then'", /^(then|то)$/
+    keyword :otherwise, "`otherwise'", /^([Oo]therwise|[Ии]наче)$/
+    keyword :_not_, "`not'", /^(not|не)$/
+    keyword :either, "`either'", /^([Ee]ither|[Ии]ли|[Лл]ибо)$/
+    keyword :_or_, "`or'", /^([Oo]r|[Ии]ли|[Лл]ибо)$/
+    keyword :_and_, "`and'", /^(and|и)$/
+    keyword :times, "`times'", /^(times|раза?)$/
+    keyword :newline, "`newline'", /^(newline|nl)$/, &proc { "\n" }
+    alias nl newline
+    
     token :comparison_op, "comparison operator" do
-      scan(/=|!=|<>|<=|>=|<|>/)
+      scan(/=\/=|=|!=|<>|<=|>=|<|>/)
     end
     
     token :asterisk, "`*'" do
       scan("*") and _(Asterisk.new)
     end
     
-    token :other_char, "any of `#№@$%/'" do
-      scan(/[\#\№\@\$\%\/]/)
-    end
-    
-    token :_for_, "`for'" do
-      t = word_ and /^([Ff]or|[Дд]ля)$/ === t
-    end
-    
-    token :all, "`all'" do
-      t = word_ and /^(all|всех)$/ === t
-    end
-    
-    token :_while_, "`while'" do
-      t = word_ and /^([Ww]hile|[Пп]ока)$/ === t
-    end
-    
-    token :_then_, "`then'" do
-      t = word_ and /^(then|то)$/ === t
-    end
-    
-    token :_if_, "`if'" do
-      t = word_ and /^([Ii]f|[Ее]сли)$/ === t
-    end
-    
-    token :_not_, "`not'" do
-      t = word_ and /^(not|не)$/ === t
-    end
-    
-    token :_or_, "`or'" do
-      t = word_ and /^([Ee]ither|[Oo]r|[Ии]ли|[Лл]ибо)$/ === t
-    end
-    
-    token :_and_, "`and'" do
-      t = word_ and /^(and|и)$/ === t
-    end
-    
-    token :times, "`times'" do
-      t = word_ and /^(times|раза?)$/ === t
-    end
-    
-    token :newline, "`newline'" do
-      t = word_ and /^(newline|nl)$/ === t and "\n"
+    token :other_char, "any of `#№@$%/[]{}'" do
+      scan(/[\#\№\@\$\%\/\[\]\{\}]/)
     end
     
     token :number, "number" do
-      n = scan(/\d+/) and n.to_i
+      n = scan(/-?\d+/) and Integer(n)
     end
     
     token :string, "string" do
@@ -884,7 +883,7 @@ class Story
     end
     
     token :var, "variable" do
-      n = word_ and
+      n = word_keyword_or_var and
       /^[_A-ZА-ЯЁ][_A-ZА-ЯЁ0-9]*$/ === n and
       _(Var[n.ru_downcase, n])
     end
@@ -894,14 +893,10 @@ class Story
     end
     
     token :word, "word" do
-      not_follows(
-        :_not_, :_and_, :_or_, :_if_, :_then_, :var, :_while_, :_for_, :all,
-        :times, :newline
-      ) and
-      word_
+      not_follows(:var, *@@keyword_method_ids) and word_keyword_or_var
     end
     
-    rule :word_ do
+    rule :word_keyword_or_var do
       scan(/[a-zA-Zа-яёА-ЯЁ_](['\-]?[a-zA-Zа-яёА-ЯЁ0-9_]+)*/)
     end
     
@@ -949,16 +944,3 @@ class Story
   end
   
 end
-
-# begin
-#   eval(Story.compile(<<-STORY)).new.write
-#     
-#     "Hello, world!" newline
-#     Either "John" loves "Liza",
-#     or ("Hello, world, again!" nl; "John" kisses "Liza";).
-#   STORY
-# rescue Parse::Error => e
-#   puts "error: #{e.pos.file}:#{e.pos.line}:#{e.pos.column}: #{e.message}"
-# # rescue Story::Error => e
-# #   puts "error: #{e.pos.file}:#{e.pos.line}:#{e.pos.column}: #{e.message}"
-# end

data/sample/fight_club.sdl

@@ -20,13 +20,13 @@ names = UniqueNames.english_male
   "- "N", the ";
     either "tiger", or "fox", or "bear", or ("horse"; N has hooves);
   " ";
-  either ("with powerful hands"; N uses "hands"),
-  or ("with powerful feet"; N uses "feet"),
+  either ("with powerful hands"; N uses "hands");
+  or ("with powerful feet"; N uses "feet");
   or:
     if ^N has hooves then (
       "with powerful hooves"; N uses "hooves"
     )
-    or (
+    otherwise (
       "with sharp claws"; N uses "claws"
     )
   .
@@ -38,20 +38,21 @@ nl
 nl
 
 While the tournament not complete:
-  If X is in and Y is in and X != Y, then:
+  If X is in and Y is in and X != Y then:
     (note: fight!)
-    either (X won; Y lost), or (Y won; X lost);
+    either (X won; Y lost) or (Y won; X lost);
     if A won and B lost then:
-      if ^A uses "hands" then ""A" has beaten "B". "
-      or if ^A uses "feet" then ""A" has kicked "B". "
-      or if ^A uses "hooves" then ""A" has kicked "B" and knocked him out. "
-      or if ^A uses "claws" then ""A" has scratched the whole "B". ";
+      if:
+        - ^A uses "hands" then ""A" has beaten "B". ";
+        - ^A uses "feet" then ""A" has kicked "B". ";
+        - ^A uses "hooves" then ""A" has kicked "B" and knocked him out. ";
+        - ^A uses "claws" then ""A" has scratched the whole "B". ";
       A not won; B not lost;
       B is not in;
     .
   .
-  Or the tournament complete;
+  Otherwise the tournament complete;
 .
 If X is in then ""X" is the winner!"
 nl
-nl
+nl

data/sample/university.sdl

@@ -1,15 +1,15 @@
 (note: this is a sample story written in SDL - Story Description Language)
 
-"Oliver" is a boy.
-"Sam" is a boy.
-"Nathan" is a boy.
-"John" is a boy.
-"Jack" is a boy.
-"Katie" is a girl.
-"Abigail" is a girl.
-"Rose" is a girl.
-"Madeleine" is a girl.
-"Liza" is a girl.
+"Oliver" is a boy;
+"Sam" is a boy;
+"Nathan" is a boy;
+"John" is a boy;
+"Jack" is a boy;
+"Katie" is a girl;
+"Abigail" is a girl;
+"Rose" is a girl;
+"Madeleine" is a girl;
+"Liza" is a girl;
 
 "
 University
@@ -17,8 +17,7 @@ University
 
 "
 
-"Once upon a time in the University went "; for all X is a boy or X is a girl,
-X", "; "that's it. They quickly became friends and went out often. "
+"Once upon a time in the University went "; for all X is a boy or X is a girl (X", "); "that's it. They quickly became friends and went out often. "
 
 While X is a boy and X not loves *:
   if X is a boy and X not loves * and Y is a girl and * not loves Y then:
@@ -53,4 +52,4 @@ nl
 nl
 "Then they all lived long and happy!"
 nl
-nl
+nl

data/sample//320/261/320/276/320/271/321/206/320/276/320/262/321/201/320/272/320/270/320/271_/320/272/320/273/321/203/320/261.sdl

@@ -26,7 +26,7 @@ names = UniqueNames.russian_male
     если ^N имеет копыта, то (
       "с мощными копытами"; N использует "копыта"
     )
-    или (
+    иначе (
       "с острыми когтями"; N использует "когти"
     )
   .
@@ -42,15 +42,16 @@ nl
     (note: бой!)
     либо (X победил; Y проиграл), либо (Y победил; X проиграл);
     если A победил и B проиграл, то:
-      если ^A использует "руки", то ""A" избил "B". "
-      или если ^A использует "ноги", то ""A" запинал "B". "
-      или если ^A использует "копыта", то ""A" лягнул "B" и вырубил его. "
-      или если ^A использует "когти", то ""A" исцарапал всего "B". ";
+      если:
+        - ^A использует "руки", то ""A" избил "B". ";
+        - ^A использует "ноги", то ""A" запинал "B". ";
+        - ^A использует "копыта", то ""A" лягнул "B" и вырубил его. ";
+        - ^A использует "когти", то ""A" исцарапал всего "B". ";
       A не победил; B не проиграл;
-      A не участвует в турнире;
+      B не участвует в турнире;
     .
   .
-  Или конец турнира;
+  Иначе конец турнира;
 .
 Если X участвует в турнире, то ""X" - победитель!"
 nl

data/sample//321/203/320/275/320/270/320/262/320/265/321/200/321/201/320/270/321/202/320/265/321/202.sdl

@@ -1,15 +1,15 @@
 (прим.: это пример стории, написанной на SDL - Языке Описания Историй)
 
-"Слава" - самец.
-"Вова" - самец.
-"Юрий" - самец.
-"Борис" - самец.
-"Гриша" - самец.
-"Зоя" - самка.
-"Вика" - самка.
-"Света" - самка.
-"Лиля" - самка.
-"Юля" - самка.
+"Слава" - самец;
+"Вова" - самец;
+"Юрий" - самец;
+"Борис" - самец;
+"Гриша" - самец;
+"Зоя" - самка;
+"Вика" - самка;
+"Света" - самка;
+"Лиля" - самка;
+"Юля" - самка;
 
 "
 Университет
@@ -17,7 +17,7 @@
 
 "
 
-"Как-то раз в университет поступили "; для всех X - самец или X - самка, X", ";
+"Как-то раз в университет поступили "; для всех X - самец или X - самка (X", ");
 "вот. Они быстро стали друзьями и часто гуляли все вместе. "
 
 Пока X - самец и X не любит *:
@@ -54,4 +54,4 @@ nl
 nl
 "И жили они долго и счастливо!"
 nl
-nl
+nl

data/sample//321/203/320/275/320/270/320/262/320/265/321/200/321/201/320/270/321/202/320/265/321/202_2.sdl

@@ -1,15 +1,15 @@
 (прим.: это пример стории, написанной на SDL - Языке Описания Историй)
 
-"Слава" - самец.
-"Вова" - самец.
-"Юрий" - самец.
-"Борис" - самец.
-"Гриша" - самец.
-"Зоя" - самка.
-"Вика" - самка.
-"Света" - самка.
-"Лиля" - самка.
-"Юля" - самка.
+"Слава" - самец;
+"Вова" - самец;
+"Юрий" - самец;
+"Борис" - самец;
+"Гриша" - самец;
+"Зоя" - самка;
+"Вика" - самка;
+"Света" - самка;
+"Лиля" - самка;
+"Юля" - самка;
 
 "
 Университет
@@ -17,7 +17,7 @@
 "
 nl
 
-"Как-то раз в университет поступили "; для всех X - самец или X - самка, X", ";
+"Как-то раз в университет поступили "; для всех X - самец или X - самка (X", ");
 "вот. Они быстро стали друзьями и часто гуляли все вместе. "
 
 Для всех X - самец или X - самка: X свободен.
@@ -66,6 +66,6 @@ nl
 
 nl
 nl
-"И жили они долго и счастливо!". Если X любит Y и ((X - самец и Y - самец) или (X - самка и Y - самка)), то " Правда, роскомнадзорненько как-то получилось.";
+"И жили они долго и счастливо!"; если X любит Y и ((X - самец и Y - самец) или (X - самка и Y - самка)), то " Правда, роскомнадзорненько как-то получилось.";
+nl
 nl
-nl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story-gen
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies: []
 description: Generate stories from descriptions based on Facts!
 email: various.furriness@gmail.com
@@ -43,6 +43,7 @@ files:
 - README.md
 - .yardopts
 - yardopts_extra.rb
+- NEWS
 - sample/fight_club.sdl
 - sample/университет.sdl
 - sample/бойцовский_клуб.sdl