teepee 0.15.9 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45bf921cbb937fd32221c42f5cc9c6544e90ae0
-  data.tar.gz: 47438d6fc1411c95cac1b1ad7a5ef3a76c7aefab
+  metadata.gz: bfbe38c9d41e1090be4155258a0c692d19b2211e
+  data.tar.gz: 4104b6609251e0e161cedc53238458c7a99ad7ac
 SHA512:
-  metadata.gz: 1145865decaa0dcdb1a44c6b09ac45e6022b187dfe4321feacb7d114c813d9c371abe6cd1b2ff4d21740a6971a4b261416e50f72e1cf534c5731b65da60c73bf
-  data.tar.gz: b57a598dd3750dff4af6dbb02728f5f72f9f4c0478c8ab8a12bfa5369e6b799242b4f32741112c8e4ea74de87a66de86edc42947b1aa073eaece60a68dc40202
+  metadata.gz: bb999c5d27222263724daf030892b9811a64f339adecdaa4b9ffa22a1b18d61cf89c1809d81dfbaeb9b01dd22d06c0b0da9a3a6f4f757f057d50f570c187c6d0
+  data.tar.gz: 14fc26a02e2192279e319a3c9aef0161566921cf49bebf319b90be57323c29dc0d7c12a1b82648f00e02899bad1a9513ceb12391b625270e74f0392c11897cfb

data/lib/teepee/command-parser.rb

@@ -46,12 +46,14 @@ require 'teepee/actionable-commander'
 
 module Teepee
   class CommandParser < ParserNode
-    attr_accessor :parser
+    attr_accessor :parser, :scope
     attr_reader :command, :expressions
 
-    def initialize(parser, command, expressions)
+    def initialize(parser, scope, command, expressions)
       @parser = parser
       raise ArgumentError if not command.is_a? WordToken
+      @scope = scope
+      raise ArgumentError if not scope.is_a? Scope
       @command = command
       raise ArgumentError if not expressions.is_a? Array
       expressions.each do |expression|
@@ -64,14 +66,24 @@ module Teepee
       %{<span style="color: red">[#{message}]</span>}
     end
 
+    def commander
+      @@commander.with_scope scope
+    end
+
+    def subscoped_commander
+      @@commander.with_scope scope.derive
+    end
+
     def to_number
       to_html.to_number
     end
 
     def to_html
-      @@commander.parser = @parser
-      if @parser.variables.include? command.word
-        @@commander.get_operator command.word
+      commander.parser = @parser
+      if @@commander.scope.has_key? command.word
+        @@commander.scope[command.word]
+      elsif @parser.variables.include? command.word
+        commander.get_operator command.word
       else
         builtins
       end
@@ -82,7 +94,7 @@ module Teepee
       when "backslash",
            "bslash",
            "-/"
-        @@commander.backslash
+        commander.backslash
       when "left-brace",
            "left_brace",
            "leftbrace",
@@ -92,7 +104,7 @@ module Teepee
            "openingbrace",
            "obrace",
            "-("
-        @@commander.left_brace
+        commander.left_brace
       when "right-brace",
            "right_brace",
            "rightbrace",
@@ -102,7 +114,7 @@ module Teepee
            "closingbrace",
            "cbrace",
            ")-"
-        @@commander.right_brace
+        commander.right_brace
       when "left-bracket",
            "left_bracket",
            "opening-bracket",
@@ -110,7 +122,7 @@ module Teepee
            "lbracket",
            "obracket",
            "(("
-        @@commander.left_bracket
+        commander.left_bracket
       when "right-bracket",
            "right_bracket",
            "closing-bracket",
@@ -118,69 +130,69 @@ module Teepee
            "rbracket",
            "cbracket",
            "))"
-        @@commander.right_bracket
+        commander.right_bracket
       when "pipe"
-        @@commander.pipe
+        commander.pipe
       when "backtick",
            "backquote",
            "'"
-        @@commander.backquote
+        commander.backquote
       when "squiggle",
            "tilde"
-        @@commander.squiggle
+        commander.squiggle
       when "dollar"
-        @@commander.dollar
+        commander.dollar
       when "_"
-        @@commander.nbsp optional_first_word_token
+        commander.nbsp optional_first_word_token
       when "space"
-        @@commander.space
+        commander.space
       when "br", "newline"
-        @@commander.br
+        commander.br
       when "bold", "b", "textbf"
-        @@commander.b expressions
+        commander.b expressions
       when "del",
            "s",
            "strike",
            "strikethrough",
            "strikeout"
-        @@commander.del expressions
+        commander.del expressions
       when "italic",
            "textit",
            "it"
-        @@commander.it expressions
+        commander.it expressions
       when "underline",
            "u"
-        @@commander.u expressions
+        commander.u expressions
       when "tt",
            "texttt",
            "teletype",
            "typewriter"
-        @@commander.tt expressions
+        commander.tt expressions
       when "small"
-        @@commander.small expressions
+        commander.small expressions
       when "big"
-        @@commander.big expressions
+        commander.big expressions
       when "subscript",
            "sub"
-        @@commander.sub expressions
+        commander.sub expressions
       when "superscript",
            "sup"
-        @@commander.sup expressions
+        commander.sup expressions
       when "h1"
-        @@commander.h1 expressions
+        commander.h1 expressions
       when "h2"
-        @@commander.h2 expressions
+        commander.h2 expressions
       when "h3"
-        @@commander.h3 expressions
+        commander.h3 expressions
       when "h4"
-        @@commander.h4 expressions
+        commander.h4 expressions
       when "h5"
-        @@commander.h5 expressions
+        commander.h5 expressions
       when "h6"
-        @@commander.h6 expressions
+        commander.h6 expressions
       when "itemize",
            "ul"
-        @@commander.itemize expressions
+        commander.itemize expressions
       when "itemize-disc",
            "ul-disc",
            "itemize_disc",
@@ -189,32 +201,32 @@ module Teepee
            "ul-disk",
            "itemize_disk",
            "ul_disk"
-        @@commander.itemize_disc expressions
+        commander.itemize_disc expressions
       when "itemize-circle",
            "ul-circle",
            "itemize_circle",
            "ul_circle"
-        @@commander.itemize_circle expressions
+        commander.itemize_circle expressions
       when "itemize-square",
            "ul-square",
            "itemize_square",
            "ul_square"
-        @@commander.itemize_square expressions
+        commander.itemize_square expressions
       when "itemize-none",
            "ul-none",
            "itemize_none",
            "ul_none"
-        @@commander.itemize_none expressions
+        commander.itemize_none expressions
       when "enumerate",
            "ol"
-        @@commander.enumerate expressions
+        commander.enumerate expressions
       when "enumerate-numeric",
            "enumerate_numeric",
            "enumerate-1",
            "ol-1",
            "enumerate_1",
            "ol_1"
-        @@commander.enumerate_numeric expressions
+        commander.enumerate_numeric expressions
       when "enumerate-uppercase",
            "enumerate_uppercase",
            "enumerate-upcase",
@@ -223,7 +235,7 @@ module Teepee
            "ol-A",
            "enumerate_A",
            "ol_A"
-        @@commander.enumerate_uppercase expressions
+        commander.enumerate_uppercase expressions
       when "enumerate-lowercase",
            "enumerate_lowercase",
            "enumerate-downcase",
@@ -232,7 +244,7 @@ module Teepee
            "ol-a",
            "enumerate_a",
            "ol_a"
-        @@commander.enumerate_lowercase expressions
+        commander.enumerate_lowercase expressions
       when "enumerate-roman-uppercase",
            "enumerate_roman_uppercase",
            "enumerate-roman-upcase",
@@ -241,7 +253,7 @@ module Teepee
            "ol-I",
            "enumerate_I",
            "ol_I"
-        @@commander.enumerate_roman_uppercase expressions
+        commander.enumerate_roman_uppercase expressions
       when "enumerate-roman-lowercase",
            "enumerate_roman_lowercase",
            "enumerate-roman-downcase",
@@ -250,60 +262,62 @@ module Teepee
            "ol-i",
            "enumerate_i",
            "ol_i"
-        @@commander.enumerate_roman_lowercase expressions
+        commander.enumerate_roman_lowercase expressions
       when "item",
            "li"
-        @@commander.item expressions
+        commander.item expressions
+      when "let1"
+        subscoped_commander.let1 expressions
       when "table"
-        @@commander.table expressions
+        commander.table expressions
       when "tr",
            "table-row",
            "table_row"
-        @@commander.table_row expressions
+        commander.table_row expressions
       when "th",
            "table-header",
            "table_header"
-        @@commander.table_header expressions
+        commander.table_header expressions
       when "td",
            "table-data",
            "table_data",
            "table-cell",
            "table_cell"
-        @@commander.table_data expressions
+        commander.table_data expressions
       when "link",
            "href",
            "url"
-        @@commander.link expressions
+        commander.link expressions
       when "email",
            "email-address",
            "email_address",
            "mailto"
-        @@commander.mailto first_word_token
+        commander.mailto first_word_token
       when "img",
            "image"
-        @@commander.image expressions
+        commander.image expressions
       when "user",
            "user-id",
            "user_id"
-        @@commander.user first_word_token
+        commander.user first_word_token
       when "link-id",
            "link_id"
-        @@commander.link_id first_word_token
+        commander.link_id first_word_token
       when "keyword-id",
            "keyword_id"
-        @@commander.keyword_id first_word_token
+        commander.keyword_id first_word_token
       when "note-id",
            "note_id"
-        @@commander.note_id first_word_token
+        commander.note_id first_word_token
       when "tag-id",
            "tag_id"
-        @@commander.tag_id first_word_token
+        commander.tag_id first_word_token
       when "forum-id",
            "forum_id"
-        @@commander.forum_id first_word_token
+        commander.forum_id first_word_token
       when "folder-id",
            "folder_id"
-        @@commander.folder_id first_word_token
+        commander.folder_id first_word_token
       when "bookmarks-folder-id",
            "bookmarks_folder_id",
            "bookmarks_folder-id",
@@ -312,148 +326,148 @@ module Teepee
            "bookmark_folder_id",
            "bookmark_folder-id",
            "bookmark-folder_id"
-        @@commander.bookmarks_folder_id first_word_token
+        commander.bookmarks_folder_id first_word_token
       when "i" # sqrt(-1), not yet supported
-        @@commander.i
+        commander.i
       when "pi"
-        @@commander.pi
+        commander.pi
       when "e"
-        @@commander.e
+        commander.e
       when "+"
-        @@commander.+ word_tokens
+        commander.+ word_tokens
       when "increment",
            "inc"
-        @@commander.increment first_word_token
+        commander.increment first_word_token
       when "decrement",
            "dec"
-        @@commander.decrement first_word_token
+        commander.decrement first_word_token
       when "-"
-        @@commander.- word_tokens
+        commander.- word_tokens
       when "*"
-        @@commander.* word_tokens
+        commander.* word_tokens
       when "/",
            "÷"
-        @@commander./ word_tokens
+        commander./ word_tokens
       when "%"
-        @@commander.% word_tokens
+        commander.% word_tokens
       when "+%"
-        @@commander.add_percentage word_tokens
+        commander.add_percentage word_tokens
       when "-%"
-        @@commander.subtract_percentage word_tokens
+        commander.subtract_percentage word_tokens
       when "%t",
            "%total"
-        @@commander.percent_total word_tokens
+        commander.percent_total word_tokens
       when "floor"
-        @@commander.floor first_word_token
+        commander.floor first_word_token
       when "ceil",
            "ciel",
            "ceiling"
-        @@commander.ceiling first_word_token
+        commander.ceiling first_word_token
       when "round"
-        @@commander.round *word_tokens
+        commander.round *word_tokens
       when "mod",
            "modulus",
            "modulo"
-        @@commander.mod word_tokens
+        commander.mod word_tokens
       when "^", "**"
-        @@commander.** word_tokens
+        commander.** word_tokens
       when "sin", "cos", "tan",
         "asin", "acos", "atan",
         "sinh", "cosh", "tanh",
         "asinh", "acosh", "atanh",
         "erf", "erfc",
         "gamma", "log10", "sqrt"
-        @@commander.send command.word.to_sym, first_word_token
+        commander.send command.word.to_sym, first_word_token
       when "d2r",
            "deg->rad",
            "degrees->radians"
-        @@commander.degrees2radians first_word_token
+        commander.degrees2radians first_word_token
       when "r2d",
            "rad->deg",
            "radians->degrees"
-        @@commander.radians2degrees first_word_token
+        commander.radians2degrees first_word_token
       when "lgamma"
-        @@commander.lgamma first_word_token
+        commander.lgamma first_word_token
       when "ld",
            "log2"
-        @@commander.ld first_word_token
+        commander.ld first_word_token
       when "ln"
-        @@commander.ln first_word_token
+        commander.ln first_word_token
       when "log"
         base, number = word_tokens
-        @@commander.log base, number
+        commander.log base, number
       when "ldexp"
         fraction, exponent = word_tokens
-        @@commander.ldexp fraction, exponent
+        commander.ldexp fraction, exponent
       when "hypot"
-        @@commander.hypot word_tokens
+        commander.hypot word_tokens
       when "true"
-        @@commander.true_constant
+        commander.true_constant
       when "false"
-        @@commander.false_constant
+        commander.false_constant
       when "not"
-        @@commander.boolean_not first_word_token
+        commander.boolean_not first_word_token
       when "and"
-        @@commander.boolean_and expressions
+        commander.boolean_and expressions
       when "or"
-        @@commander.boolean_or expressions
+        commander.boolean_or expressions
       when "nand"
-        @@commander.boolean_nand expressions
+        commander.boolean_nand expressions
       when "nor"
-        @@commander.boolean_nor expressions
+        commander.boolean_nor expressions
       when "xor"
-        @@commander.boolean_xor expressions
+        commander.boolean_xor expressions
       when "xnor"
-        @@commander.boolean_xnor expressions
+        commander.boolean_xnor expressions
       when "<"
-        @@commander.less_than word_tokens
+        commander.less_than word_tokens
       when "<=",
            "≤"
-        @@commander.less_than_or_equal word_tokens
+        commander.less_than_or_equal word_tokens
       when ">"
-        @@commander.greater_than word_tokens
+        commander.greater_than word_tokens
       when ">=",
            "≥"
-        @@commander.greater_than_or_equal word_tokens
+        commander.greater_than_or_equal word_tokens
       when "="
-        @@commander.equal word_tokens
+        commander.equal word_tokens
       when "!=",
            "≠"
-        @@commander.not_equal word_tokens
+        commander.not_equal word_tokens
       when "if"
-        @@commander.if_operator expressions
+        commander.if_operator expressions
       when "when"
-        @@commander.when_operator expressions
+        commander.when_operator expressions
       when "unless"
-        @@commander.unless_operator expressions
+        commander.unless_operator expressions
       when "comment",
            "!--",
            "#"
-        @@commander.comment expressions
+        commander.comment expressions
       when "span"
-        @@commander.span_operator expressions
+        commander.span_operator expressions
       when "prog1"
-        @@commander.prog1_operator expressions
+        commander.prog1_operator expressions
       when "progn"
-        @@commander.progn_operator expressions
+        commander.progn_operator expressions
       when "prognil"
-        @@commander.prognil expressions
+        commander.prognil expressions
       when "cond"
-        @@commander.cond_operator expressions
+        commander.cond_operator expressions
       when "case"
-        @@commander.case_operator expressions
+        commander.case_operator expressions
       when "get"
-        @@commander.get_operator first_word_token
+        commander.get_operator first_word_token
       when "define",
            "def"
-        @@commander.define expressions
+        commander.define expressions
       when "undefine",
            "undef"
-        @@commander.undefine expressions
+        commander.undefine expressions
       when "defined?"
-        @@commander.is_defined? word_tokens
+        commander.is_defined? word_tokens
       when "dotimes"
-        @@commander.dotimes expressions
+        commander.dotimes expressions
       else
         command_error "unknown command #{command.to_html}"
       end
@@ -484,8 +498,9 @@ module Teepee
       @@action_view = nil
       @@controller = nil
 
-      def parse(parser, tokens)
+      def parse(parser, scope, tokens)
         @parser = parser
+        @scope = scope
         expressions = []
         rest = tokens
         backslash, command, left_brace = rest.shift(3)
@@ -494,23 +509,23 @@ module Teepee
         raise ParseError if not command.is_a? WordToken
         if not left_brace.is_a? LeftBraceToken # A command with no interior.
           rest.unshift left_brace if not left_brace.is_a? WhitespaceToken
-          return [CommandParser.new(parser, command, []), rest]
+          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
             expressions << rest.shift
           elsif rest.first.is_a? BackslashToken
-            result, rest = CommandParser.parse(parser, rest)
+            result, rest = CommandParser.parse(parser, scope, rest)
             expressions << result
           elsif rest.first.is_a? RightBraceToken
             right_brace = rest.shift
-            return [CommandParser.new(parser, command, expressions), rest]
+            return [CommandParser.new(parser, scope, command, expressions), rest]
           else
             raise ParseError
           end
         end
         if right_brace.nil? # Allow a forgotten final right brace.
-          return [CommandParser.new(parser, command, expressions), rest]
+          return [CommandParser.new(parser, scope, command, expressions), rest]
         end
       end
 

data/lib/teepee/commander-mixins/control.rb

@@ -59,19 +59,20 @@ module Teepee
       end
 
       def cond_operator expressions
-        conditional, _, form, *rest = strip expressions
+        conditional, _, form, *body = strip expressions
         if true_constant? conditional.to_html
           form
-        elsif not rest.empty?
-          cond_operator rest
+        elsif not body.empty?
+          cond_operator body
         end
       end
 
       def decrement variable
-        return variable_not_defined_error variable if not is_defined? variable
-        old_value = get_operator(variable).to_number
+        k = variable.to_html
+        return variable_not_defined_error k if not is_defined? k
+        old_value = get_operator(k).to_number
         return non_numeric_error old_value if not numeric? old_value
-        @parser.variables[variable.to_html] = old_value - 1
+        update_variable k, old_value - 1
       end
 
       def define expressions
@@ -85,13 +86,34 @@ module Teepee
       def is_defined? variables
         if not variables.is_a? Array
           return is_defined? [variables]
-        elsif Set.new(variables.map(&:to_html)).subset? Set.new(@parser.variables.keys)
-          true_constant
         else
-          false_constant
+          Set.new(variables.map(&:to_html))
+            .subset? Set.new(scope.keys + @parser.variables.keys)
         end
       end
 
+      def is_scoped? variables
+        if not variables.is_a? Array
+          return is_scoped? [variables]
+        else
+          Set.new(variables.map(&:to_html))
+            .subset? Set.new(scope.keys)
+        end
+      end
+
+      def update_variable variable, value
+        k = variable.to_html
+        value = value.to_html
+        if is_scoped? k
+          scope[k] = value
+        elsif is_defined? k
+          @parser.variables[k] = value
+        else
+          variable_not_defined_error k
+        end
+        value
+      end
+
       def dotimes expressions
         n = expressions.first.to_number
         return "" if n.nil? or n < 1
@@ -109,7 +131,14 @@ module Teepee
       end
 
       def get_operator variable
-        @parser.variables[variable.to_html].to_html
+        key = variable.to_html
+        if scope.has_key? key
+          scope[key]
+        elsif @parser.variables.has_key? key
+          @parser.variables[key].to_html
+        else
+          variable_not_defined_error key
+        end
       end
 
       def if_operator expressions
@@ -123,10 +152,26 @@ module Teepee
       end
 
       def increment variable
-        return variable_not_defined_error variable if not is_defined? variable
-        old_value = get_operator(variable).to_number
+        k = variable.to_html
+        return variable_not_defined_error k if not is_defined? k
+        old_value = get_operator(k).to_number
         return non_numeric_error old_value if not numeric? old_value
-        @parser.variables[variable.to_html] = old_value + 1
+        update_variable k, old_value + 1
+      end
+
+      def update_scope body
+        body.map do |clause|
+          if clause.kind_of? CommandParser
+            clause.scope = scope
+          end
+        end
+        body
+      end
+
+      def let1 expressions
+        variable, _, value, _, *body = expressions
+        scope[variable.to_html] = value.to_html
+        update_scope(body).map(&:to_html)
       end
 
       def not_equal numbers

data/lib/teepee/commander.rb

@@ -49,12 +49,17 @@ module Teepee
     include CommanderMixins::Mathematics
     include CommanderMixins::ThinkingBicycleModels
 
-    attr_accessor :parser
+    attr_accessor :parser, :scope
 
     def initialize params
       # We don't use the params in the base class, but might in derived classes.
     end
 
+    def with_scope scope
+      @scope = scope
+      self
+    end
+
     def valid_uri? uri
       (!! (u = URI.parse(uri))) and not u.scheme.nil?
     rescue URI::InvalidURIError

data/lib/teepee/paragraph-parser.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- mode: Ruby -*-
 
-# Copyright © 2013-2015, Christopher Mark Gore,
+# Copyright © 2013-2016, Christopher Mark Gore,
 # Soli Deo Gloria,
 # All rights reserved.
 #
@@ -39,6 +39,7 @@ require 'teepee/parser-node'
 require 'teepee/token'
 require 'teepee/commander'
 require 'teepee/actionable-commander'
+require 'teepee/scope'
 require 'teepee/single-character-token'
 require 'teepee/string-token'
 require 'teepee/number-token'
@@ -66,7 +67,7 @@ module Teepee
         elsif rest.first.is_a? WhitespaceToken
           @expressions << rest.shift
         elsif rest.first.is_a? BackslashToken
-          command, rest = CommandParser.parse(@parser, rest)
+          command, rest = CommandParser.parse(@parser, Scope.new, rest)
           @expressions << command
         else
           return self

data/lib/teepee/scope.rb

@@ -0,0 +1,88 @@
+# -*- 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 Scope
+    attr_accessor :father, :variables
+
+    def initialize father = nil
+      @father = father
+      @variables = Hash.new
+    end
+
+    def orphan?
+      not father or father.nil?
+    end
+
+    def keys
+      variables.keys
+    end
+
+    def has_key? key
+      variables.has_key?(key) or
+        (not orphan? and father.has_key?(key))
+    end
+
+    def [](key)
+      if variables.has_key? key
+        variables[key]
+      elsif father
+        father[key]
+      end
+    end
+
+    def []=(key, value)
+      variables[key] = value
+    end
+
+    def scope_for key
+      if variables.has_key? key
+        self
+      else
+        father.scope_for key
+      end
+    end
+
+    def shadow? key
+      has_key?(key) and not orphan? and father.has_key?(key)
+    end
+
+    def derive
+      self.class.new self
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teepee
 version: !ruby/object:Gem::Version
-  version: 0.15.9
+  version: 0.16.0
 platform: ruby
 authors:
 - Christopher Mark Gore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,6 +59,7 @@ files:
 - lib/teepee/paragraph-parser.rb
 - lib/teepee/parser-node.rb
 - lib/teepee/parser.rb
+- lib/teepee/scope.rb
 - lib/teepee/single-character-token.rb
 - lib/teepee/string-token.rb
 - lib/teepee/token.rb