teepee 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c350c8cf2e7e7def57a44a5c72b6347aaa542f
-  data.tar.gz: b1fc8f3718dface30a05756b990278a76670e4e0
+  metadata.gz: 728d9d50f5037e176591834141724345721e6013
+  data.tar.gz: e243574356bbbc92b7992e7b74adf00d7b38783a
 SHA512:
-  metadata.gz: 4924a990c000113a609a5122ea6a550dec8a14a15ae7c3ddef4eff22bcc8bcce6d19b94283e2e78a2b9d2dc64687619b57d25aa5dafa2254f76a30b7e4cdf5f4
-  data.tar.gz: 7c079ca358e1dc0c0a7054ee1ee341efbef4f944bc1a955aa596a944701c01ce046b7194464064c3ae1628b98552b580a37f6326e4162a89c017c8088b7437d5
+  metadata.gz: dbab2447521fab020fa8bac262c35b487d50a7eaf94d936f0922ee7f834d37d42c18ec5b79f7487350c8238e2df7b247e4ab2db4e88629fb93f2094423009aba
+  data.tar.gz: 649d0a5561c83bf40c18955e96e1c0eecdcac2e91cbb5d1dd5da900f5947814a866ed20b614b9f5789cbb1238775e0d760b738cd5b0eedc5bd4d0fa34b39de4d

data/lib/teepee/command-parser.rb

@@ -43,13 +43,14 @@ require 'teepee/errors'
 require 'teepee/parser-node'
 require 'teepee/commander'
 require 'teepee/actionable-commander'
+require 'teepee/list-parser'
 
 module Teepee
   class CommandParser < ParserNode
-    attr_accessor :parser, :scope
-    attr_reader :command, :expressions
+    attr_accessor :command, :expressions, :parser, :scope
 
     def initialize(parser, scope, command, expressions)
+      raise ArgumentError if not parser.is_a? Parser
       @parser = parser
       raise ArgumentError if not command.is_a? WordToken
       @scope = scope
@@ -522,9 +523,12 @@ module Teepee
           return [CommandParser.new(parser, scope, command, []), rest]
         end
         while rest.length > 0
-          if rest.first.is_a? WordToken or
-             rest.first.is_a? WhitespaceToken or
-             rest.first.is_a? PipeToken
+          if rest.first.is_a? LeftBraceToken
+            list, rest = ListParser.parse parser, scope.derive, rest
+            expressions << list
+          elsif rest.first.is_a? WordToken or
+                rest.first.is_a? WhitespaceToken or
+                rest.first.is_a? PipeToken
             expressions << rest.shift
           elsif rest.first.is_a? BackslashToken
             result, rest = CommandParser.parse(parser, scope, rest)

data/lib/teepee/list-parser.rb

@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+# -*- mode: Ruby -*-
+
+# Copyright © 2013-2016, Christopher Mark Gore,
+# Soli Deo Gloria,
+# All rights reserved.
+#
+# 2317 South River Road, Saint Charles, Missouri 63303 USA.
+# Web: http://cgore.com
+# Email: cgore@cgore.com
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   * Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   * Neither the name of Christopher Mark Gore nor the names of other
+#     contributors may be used to endorse or promote products derived from
+#     this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+module Teepee
+  class ListParser < ParserNode
+    attr_accessor :parser, :scope, :expressions
+
+    def initialize parser, scope, expressions
+      raise ArgumentError if not parser.is_a? Parser
+      @parser = parser
+      raise ArgumentError if not scope.is_a? Scope
+      @scope = scope
+      expressions.each do |expression|
+        raise ArgumentError if not expression.kind_of? ParserNode
+      end
+      @expressions = expressions
+    end
+
+    def to_html
+      "{" + expressions.map(&:to_html).join(" ") + "}"
+    end
+
+    def use_scope scope
+      @scope = scope
+      expressions.map {|node| node.use_scope scope}
+    end
+
+    class << self
+      def parse parser, scope, tokens
+        expressions = []
+        rest = tokens
+        left_brace = rest.shift
+        right_brace = nil
+        raise ParseError if not left_brace.is_a? LeftBraceToken
+        while rest.length > 0
+          if rest.first.is_a? LeftBraceToken
+            list, rest = ListParser.parse parser, scope.derive, rest
+            expressions << list
+          elsif rest.first.is_a? WordToken or
+                rest.first.is_a? PipeToken
+            expressions << rest.shift
+          elsif rest.first.is_a? WhitespaceToken
+            rest.shift # Drop the whitespace, this is the list separator.
+          elsif rest.first.is_a? BackslashToken
+            result, rest = CommandParser.parse parser, scope, rest
+            expressions << result
+          elsif rest.first.is_a? RightBraceToken
+            right_brace = rest.shift
+            return [ListParser.new(parser, scope, expressions), rest]
+          else
+            raise ParseError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/teepee/paragraph-parser.rb

@@ -45,12 +45,14 @@ require 'teepee/string-token'
 require 'teepee/number-token'
 require 'teepee/tokenizer'
 require 'teepee/command-parser'
+require 'teepee/list-parser'
 
 module Teepee
   class ParagraphParser < ParserNode
     attr_accessor :expressions, :parser, :scope, :tokens
 
     def initialize(parser, tokens)
+      raise ArgumentError if not parser.is_a? Parser
       @parser = parser
       @scope = Scope.new
       raise ArgumentError if not tokens.is_a? Array
@@ -63,7 +65,10 @@ module Teepee
       @expressions = []
       rest = tokens
       while rest.length > 0
-        if rest.first.is_a? WordToken
+        if rest.first.is_a? LeftBraceToken
+          list, rest = ListParser.parse parser, scope.derive, rest
+          @expressions << list
+        elsif rest.first.is_a? WordToken
           @expressions << rest.shift
         elsif rest.first.is_a? WhitespaceToken
           @expressions << rest.shift

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teepee
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Christopher Mark Gore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,6 +83,7 @@ files:
 - lib/teepee/commander.rb
 - lib/teepee/constants.rb
 - lib/teepee/errors.rb
+- lib/teepee/list-parser.rb
 - lib/teepee/number-token.rb
 - lib/teepee/paragraph-parser.rb
 - lib/teepee/parser-node.rb