eggshell 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f0c6e2c0d46c6a179f5ec5b92860f89191cb49
-  data.tar.gz: 6a2796788c613161da16ea59f2fbee7e3287e116
+  metadata.gz: d333cbc627c5af623979142276a316f4cc249026
+  data.tar.gz: b4abb4e1c883a743b702ae184790a96164b6a207
 SHA512:
-  metadata.gz: 0c0c82ea72213e521a12dba7aa595f3ccedb7dee48141df53c30ffae2fb49de2afc5eba567a1fb608fbdd844316aacb03c547145aa3d1d5082343d27541a11de
-  data.tar.gz: 36468590248a2d9c2d4638915166e56985d59ba989c00f3934dd88089705a6f85a7b80d6af39fd1f5f92df340f69b17e6d2906bf3449951d5288d0aba2e588c0
+  metadata.gz: cf06dc8012c489ee0387f6338cab00067660f671b2aaf0aa7042a5ea1dc152c1ae4dc5eecdcb64232e1d7065ffdb70efde18ac21a58e5dff1cfeb735c9854fa0
+  data.tar.gz: a1bb8fee382b92f2f8788a80c44fd094634d28db437e3f0a9c305017f98e3e2570ef2488131bb1d0fa10682b57e3552304061218413d82501fac6009e14e0741

data/lib/eggshell/bundles/basics.rb

@@ -64,9 +64,8 @@ module Eggshell::Bundles::Basic
 			html = line.match(HTML_BLOCK)
 			if html
 				@block_type = 'html_block'
-
 				end_html = HTML_BLOCK_END["<#{html[1]}"]
-				end_html = "</#{html[1]}>$" if !end_html
+				end_html = "</#{html[1]}>" if !end_html
 				if line.match(end_html)
 					return BH::DONE
 				end
@@ -387,8 +386,14 @@ module Eggshell::Bundles::Basic
 				end
 
 				lines.each do |line_obj|
-					line = line_obj.is_a?(Eggshell::Line) ? line_obj.line : line_obj
-					indent = line_obj.indent_lvl
+					line = nil
+					indent = 0
+					if line_obj.is_a?(Eggshell::Line)
+						line = line_obj.line
+						indent = line_obj.indent_lvl
+					else
+						line = line_obj
+					end
 					ltype = line[0] == '-' ? 'ul' : 'ol'
 					line = line[1..line.length].strip
 
@@ -663,6 +668,10 @@ module Eggshell::Bundles::Basic
 			end
 		end
 
+		def collection_type(macro)
+			macro == 'raw' ? MH::COLLECT_RAW_MACRO : MH::COLLECT_NORMAL
+		end
+
 		def process(name, args, lines, out, call_depth = 0)
 			if name == '=' || name == 'var'
 				# @todo expand args[0]?
@@ -709,7 +718,7 @@ module Eggshell::Bundles::Basic
 							out << @eggshell.assemble(unit, call_depth + 1)
 						end
 					else
-						out << line
+						out << unit
 					end
 				end
 			elsif name == 'pipe'

data/lib/eggshell/expression-evaluator.rb

@@ -15,11 +15,26 @@ module Eggshell; class ExpressionEvaluator
 		"\\'" => "'",
 		'\\"' => '"'
 	}.freeze
+
+	OP_ASSIGN = '='.to_sym
+	OP_EQQ = '==='.to_sym
+	OP_EQ = '=='.to_sym
+	OP_NEQ = '!='.to_sym
+	OP_MATCH = '=~'.to_sym
+	OP_NMATCH = '!=~'.to_sym
+	OP_MULTIPLY = '*'.to_sym
+	OP_DIVIDE = '/'.to_sym
+	OP_ADD = '+'.to_sym
+	OP_SUBTRACT = '-'.to_sym
 	
+	# Values give corresponding order of precedence
 	OPERATOR_MAP = {
-		'='.to_sym => 1000,
-		'=='.to_sym => 999,
-		'!='.to_sym => 999,
+		OP_ASSIGN => 1000,
+		OP_EQQ => 999,
+		OP_EQ => 998,
+		OP_NEQ => 998,
+		OP_MATCH => 997,
+		OP_NMATCH => 997,
 		'<'.to_sym => 990,
 		'<='.to_sym => 990,
 		'>'.to_sym => 990,
@@ -31,12 +46,12 @@ module Eggshell; class ExpressionEvaluator
 		'~'.to_sym => 200,
 		'&'.to_sym => 200,
 		'|'.to_sym => 199,
-		'*'.to_sym => 150,
-		'/'.to_sym => 150,
+		OP_MULTIPLY => 150,
+		OP_DIVIDE => 150,
 		'%'.to_sym => 150,
 		'^'.to_sym => 150,
-		'+'.to_sym => 100,
-		'-'.to_sym => 100,
+		OP_ADD => 100,
+		OP_SUBTRACT => 100,
 		'&&'.to_sym => 99,
 		'||'.to_sym => 99
 	}.freeze
@@ -47,6 +62,8 @@ module Eggshell; class ExpressionEvaluator
 		@cache = {}
 		@parser = Parser::DefaultParser.new
 		#@evaluator = Evaluator.new(@vars, @funcs)
+		@func_whitelist = {}
+		@func_wl_alias = {}
 	end
 	
 	# Maps 1 or more virtual function names to a handler.
@@ -75,42 +92,147 @@ module Eggshell; class ExpressionEvaluator
 			@funcs["#{ns}:"] = handler
 		end
 	end
+	
+	# Registers 1+ getters and/or setters for a given class/module, avoiding
+	# need to alias or proxy methods to use `get_` and `set_` names.
+	def register_function_whitelist(clz, getters, setters = nil)
+		if !clz.is_a?(String)
+			clz = clz.name if clz.is_a?(Class)
+			#clz = clz.name if clz.is_a?(Class)
+		end
+		@func_whitelist[clz] = {:get => {}, :set => {}}
+		if getters.is_a?(Array)
+			getters.each do |get|
+				@func_whitelist[clz][:get][get] = true
+			end
+		end
+		if setters.is_a?(Array)
+			setters.each do |set|
+				@func_whitelist[clz][:set][set] = true
+			end
+		end
+	end
+	
+	# The function whitelist expects a given object's class to be a direct
+	# mapping into the whitelist. Use this method to register all super classes
+	# and interfaces of the given object that can be looked up if a mapping
+	# fails.
+	def register_function_alias(obj)
+		clz = obj.is_a?(Class) ? obj : obj.class
+		ptr = []
+		clz.ancestors.each do |anc|
+			next if anc == clz
+			ptr << anc.name
+		end
+		@func_wl_alias[clz.name] = ptr
+	end
+	
+	def resolve_function_alias(obj)
+		clz = obj.is_a?(Class) ? obj.name : obj.class.name
+		return @func_wl_alias[clz] || []
+	end
+	
+	def has_function_alias(obj, func_name, type = :get)
+		clz = obj.is_a?(Class) ? obj.name : obj.class.name
+		if @func_whitelist[clz] && @func_whitelist[clz][type][func_name]
+			return true
+		end
+		
+		ret = false
+		if @func_wl_alias[clz]
+			@func_wl_alias[clz].each do |ali|
+				ali = @func_whitelist[ali]
+				if ali && ali[type][func_name]
+					ret = true
+					break
+				end
+			end
+		end
+		
+		return ret
+	end
+	
+	def get_function_aliases
+		ret = []
+		@func_whitelist.each do |clz, map|
+			ret << clz
+			ret << "\tgetters: #{map[:get].keys.join(', ')}"
+			ret << "\tsetters: #{map[:set].keys.join(', ')}"
+		end
+		@func_wl_alias.each do |clz, arr|
+			ret << clz
+			arr.each do |ali|
+				star = @func_whitelist[ali] ? ' *' : ''
+				ret << "\t=> #{ali}#{star}"
+			end
+		end
+		ret
+	end
 
 	attr_reader :vars, :funcs, :parser
 
 	def parse(statement, cache = true)
-		parsed = @cache[statement]
-		return parsed if cache && parsed
+		if cache
+			parsed = @cache[statement]
+			return parsed if parsed
+		end
 
-		parsed = @parser.parse(statement)
-		@cache[statement] = parsed if cache
-		return parsed
+		@cache[statement] = @parser.parse(statement)
+		return @cache[statement].clone
 	end
 
 	def evaluate(statement, do_parse = true, cache = true, vtable = nil, ftable = nil)
 		vtable = @vars if !vtable.is_a?(Hash)
 		ftable = @funcs if !ftable.is_a?(Hash)
 		parsed = statement
-
+		#$stderr.write "!!! #{vtable.inspect} // #{@vars.inspect} !!!\n"
+		#$stderr.write "parsed = #{parsed.inspect}||vtable=#{vtable.inspect}\n"
 		if !statement.is_a?(Array)
 			return statement if !do_parse || !statement.is_a?(String)
 			parsed = parse(statement, cache)
+		elsif parsed[0].is_a?(Symbol)
+			parsed = [parsed]
+			#$stderr.write "^^ fixed up\n"
 		end
 
 		ret = nil
 		parsed.each do |frag|
 			ftype = frag[0]
 			if ftype == :op
-				op_val = frag[1][0].is_a?(Array) ? evaluate([frag[1][0]], false) : frag[1][0]
-				z = 1
-				while z < frag[1].length
-					op = frag[1][z]
-					rop = frag[1][z+1]
-					rop = evaluate([rop]) if rop.is_a?(Array)
-					op_val = self.class.op_eval(op_val, op, rop)
+				# [:op, [operand, operator, operand(, operator, operand, ...)]]
+				# z contains the start index of the operator-operand list. if the first operator is '=',
+				# reserve first operand as var reference and evaluate everything after '=' before storing
+				# into var ref
+				z = 0
+				oplist = frag[1]
+				if oplist[1] == OP_ASSIGN
+					if !oplist[0].is_a?(Array) || oplist[0][0] != :var
+						raise Exception.new("Illegal assignment to non-variable: #{frag[1][0].inspect}")
+					end
+					z = 2
+				end
+
+				op_val = oplist[z]
+				if op_val.is_a?(Array)
+					op_val = op_val[0] == :var ? var_access(op_val) : evaluate([oplist[z]], false)
+				end
+
+				z += 1
+				while z < oplist.length
+					op = oplist[z]
+					rop = oplist[z+1]
+					if rop.is_a?(Array)
+						rop = rop[0] == :var ? var_access(rop) : evaluate([rop])
+					end
+					op_val = self.class.op_eval(op_val, op.to_sym, rop)
 					z += 2
 				end
 				ret = op_val
+				
+				# var assignment; return true for successful set or false otherwise
+				if oplist[1] == OP_ASSIGN
+					ret = var_access(oplist[0], nil, ret)
+				end
 			elsif ftype == :op_tern
 				cond = frag[1].is_a?(Array) ? evaluate(frag[1]) : frag[1]
 				if cond
@@ -147,7 +269,8 @@ module Eggshell; class ExpressionEvaluator
 					ret = handler.exec_func(name, frag[2])
 				end
 			elsif ftype == :var
-				ret = var_get(frag, false, vtable)
+				#$stderr.write "<<< VAR\n"
+				ret = var_access(frag, vtable)[0]
 			elsif ftype == :group
 				ret = evaluate(frag[1], false, cache, vtable)
 			elsif ftype == :array
@@ -179,121 +302,178 @@ module Eggshell; class ExpressionEvaluator
 		ret
 	end
 	
-	# @todo have one set for strings, one set for numbers, and a general set for everything else
-	# @todo what to do with unsupported ops?
 	def self.op_eval(lop, op, rop)
-		if (lop.is_a?(Numeric) && rop.is_a?(Numeric)) || lop.is_a?(rop.class)
-			op = op.to_s
-			case op
-			when '==='
-				return lop === rop
-			when '=='
-				return lop == rop
-			when '!='
-				return lop != rop
-			when '+'
+		#$stderr.write "op_eval:\n\t#{lop.inspect} #{op.inspect} #{rop.inspect}\n"
+		if (lop.is_a?(Numeric) && rop.is_a?(Numeric))
+			if op == OP_MATCH || op == OP_NMATCH
+				raise Exception.new("'#{op}' can only be used with strings -- #{lop} #{op} #{rop}")
+			end
+			return lop.send(op, rop)
+		elsif op == OP_EQQ
+			return lop === rop
+		elsif rop == :empty && (op == OP_EQ || op == OP_NEQ)
+			# essentially (lop == false || lop == nil || lop == '') [==|!=] true
+			# @todo other conditions to check empty?
+			return (lop == false || lop == nil || lop == '').send(op, true)
+		elsif lop.is_a?(String)
+			e = nil
+			if op == OP_MULTIPLY
+				if rop.is_a?(Numeric)
+					return lop * rop
+				else
+					e = "multiply string with numeric, #{rop.class} given"
+				end
+			elsif op == OP_MATCH || op == OP_NMATCH
+				if rop.is_a?(String)
+					m = lop.match(rop)
+					if op == OP_NMATCH
+						m = m == nil ? true : false
+					end
+					return m
+				else
+					e = "'#{op}' expects right operand to be string, #{rop.class} given"
+				end
+			elsif op == OP_ADD
 				return lop + rop
-			when '-'
-				return lop - rop
-			when '/'
-				return lop / rop
-			when '*'
+			end
+					
+			raise Exception.new(e) if e
+		elsif lop.is_a?(Array)
+			if op == OP_MULTIPLY && rop.is_a?(Numeric)
 				return lop * rop
-			when '<<'
-				return lop << rop
-			when '>>'
-				return lop >> rop
-			when '<'
-				return lop < rop
-			when '<='
-				return lop <= rop
-			when '>'
-				return lop > rop
-			when '>='
-				return lop >= rop
-			when '|'
-				return lop | rop
-			when '||'
-				return lop || rop
-			when '&'
-				return lop & rop
-			when '&&'
-				return lop && rop
-			when '%'
-				return lop % rop
-			when '^'
-				return lop ^ rop
-			when '='
-				# @todo assign rop to lop
+			elsif (op == OP_ADD || op == OP_SUBTRACT) && rop.is_a?(Array)
+				return lop.send(op, rop)
 			end
+			raise Exception.new("unsupported operation: #{lop.class} #{op} #{rop.class}")
 		else
 			
 		end
 	end
 	
-	def var_get(var, do_ptr = false, vtable = nil)
+	# Gets or sets a variable reference. If reference is a string, an exact match is looked for
+	# in vars table, otherwise an array (complex reference) is expected. If a value is given
+	# in the `set_var` parameter, an attempt is made to assign the value (provided there's
+	# a suitable method to handle setting).
+	#
+	# For a complex variable reference, iteratively chains a parent var with a child variable
+	# identifier. The return value is an array that returns the resolved value, its parent var,
+	# and the final identifier. In the case of setting, the resolved value is {{true}} if a setter
+	# was found and {{false}} otherwise.
+	#
+	# @param String|Array var If a string, an exact match is attempted in vars table, 
+	# otherwise an array with a parsed variable expression is expected.
+	# @param Hash vtable Optional vars table. If `nil`, uses `@vars`.
+	# @param Object set_var If not equivalent to `:nope`, assumes some sort of assignment.
+	# A symbol is used as a check since symbols are not supported in expressions.
+	# @return Array A 3-element array in the following format: `[value, parent_var, child_var_ident]
+	def var_access(var, vtable = nil, set_var = :nope)
 		vtable = @vars if !vtable
 		if var.is_a?(String)
+			return :empty if var == 'empty'
 			if var.match(/^[a-zA-Z_][a-zA-Z0-9_\.]*$/)
-				return vtable[var] if vtable.has_key?(var)
+				if vtable.has_key?(var)
+					if set_var == :nope
+						return [vtable[var], nil, nil]
+					else
+						vtable[var] = set_var
+						return [true, nil, nil]
+					end
+				end
 			end
 			var = @parser.parse(var)
 		end
+		
+		return :empty if var[1] == 'empty'
 
 		ptr_lst = nil
 		ptr = vtable
-
 		i = 0
 		parts = var
-		# @todo if do_ptr, set it as parts.length - 1? (and avoid having to save ptr_lst)
-		while (i < parts.length)
+		set_point = set_var == :nope ? parts.length + 1 : parts.length - 1
+		while (i < parts.length && ptr != nil)
 			part = parts[i]
 			ptr_lst = ptr
 			if part == :var
 				key = parts[i+1]
-				if ptr.is_a?(Hash) && ptr[key]
-					ptr = ptr[key]
-					if ptr != nil
-						i += 2
-						next
+				if ptr.is_a?(Hash)
+					if i == set_point
+						ptr[key] = set_var
+						ptr = true
+					elsif ptr[key]
+						ptr = ptr[key]
+						if ptr != nil
+							i += 2
+							next
+						end
 					else
-						break
+						ptr = nil
 					end
 				else
 					ptr = nil
-					break
 				end
 			elsif part[0] == :index_access
 				idx = part[1]
 				if idx.is_a?(Array)
-					idx = var_get(idx)
+					idx = var_access(idx)[0]
 					if idx == nil
 						ptr = nil
 						break
 					end
 				end
-				if (ptr.is_a?(Array) || ptr.is_a?(Hash)) && ptr[idx]
-					ptr = ptr[idx]
+				if (ptr.is_a?(Array) || ptr.is_a?(Hash))
+					if i == set_point
+						ptr[idx] = set_var
+						ptr = true
+					else
+						ptr = ptr[idx]
+					end
 				else
 					ptr = nil
-					break
 				end
 			elsif part[0] == :member_access
-				mname = 'get_' + part[1]
-				if ptr.respond_to?(mname.to_sym)
-					ptr = ptr.send(mname.to_sym)
+				if ptr.is_a?(Hash)
+					if i == set_point
+						ptr[part[1]] = set_var
+						ptr = true
+					else
+						ptr = ptr[part[1]]
+					end
 				else
-					ptr = nil
-					break
+					prefix = 'get_'
+					type = :get
+					if i == set_point
+						prefix = 'set_'
+						type = :set
+					end
+
+					mname = (prefix + part[1]).to_sym
+					tgt = nil
+
+					if ptr.respond_to?(mname)
+						tgt = mname
+					elsif has_function_alias(ptr, part[1], type)
+						tgt = part[1].to_sym
+					end
+					if tgt
+						if type == :set
+							ptr.send(tgt, set_var)
+							ptr = true
+						else
+							ptr = ptr.send(tgt)
+						end
+					else
+						ptr = nil
+					end
 				end
 			elsif part[0] == :func
+				# @todo throw exception if this is set_point?
+				# @todo what happens when we have `var[something](fn_args)`
 				ptr = evaluate(part, false)
-				break if ptr == nil
 			end
 			i += 1
 		end
-		
-		return do_ptr ? ptr_lst : ptr
+		return [ptr, ptr_lst, parts[-1]]
+		#return do_ptr ? ptr_lst : ptr
 	end
 
 	def var_set(var, val)
@@ -306,4 +486,40 @@ end; end
 
 require_relative './expression-evaluator/lexer.rb'
 require_relative './expression-evaluator/parser.rb'
-require_relative './expression-evaluator/evaluator.rb'
+require_relative './expression-evaluator/evaluator.rb'
+
+# --- move this to a test! --
+# class AClass < String
+# 	include Eggshell
+
+# 	def normal_getter()
+# 	end
+	
+# 	def another_method()
+# 	end
+	
+# 	def normal_setter(val)
+# 	end
+
+# 	def get_test()
+# 	end
+# end
+
+# class BClass < AClass
+# 	def scroopy_noopers
+# 	end
+# end
+
+# ee = Eggshell::ExpressionEvaluator.new
+# ee.register_function_whitelist(String, ['length'])
+# ee.register_function_whitelist(AClass, ['normal_getter'], ['normal_setter'])
+# ee.register_function_alias(AClass)
+# ee.register_function_alias(BClass)
+# aclass = AClass.new
+# bclass = BClass.new
+
+# puts "aclass.length ? #{ee.has_function_alias(aclass, 'length')}"
+# puts "aclass.normal_setter ? #{ee.has_function_alias(aclass, 'normal_setter', :set)}"
+# puts "bclass.normal_getter ? #{ee.has_function_alias(bclass, 'normal_getter', :get)}"
+# puts "bclass.another_method ? #{ee.has_function_alias(aclass, 'another_method', :get)}"
+# puts ee.get_function_aliases.join("\n")

data/lib/eggshell/expression-evaluator/lexer.rb

@@ -1,7 +1,7 @@
 
-# line 1 "lexer.ragel"
+# line 1 "lib/eggshell/expression-evaluator/lexer.ragel"
 
-# line 71 "lexer.ragel"
+# line 71 "lib/eggshell/expression-evaluator/lexer.ragel"
 
 # %
 
@@ -11,7 +11,7 @@ class Eggshell::ExpressionEvaluator::Lexer
 	def initialize(parser)
 		@parser = parser
 		
-# line 15 "lexer.rb"
+# line 15 "lib/eggshell/expression-evaluator/lexer.rb"
 class << self
 	attr_accessor :_eggshell_actions
 	private :_eggshell_actions, :_eggshell_actions=
@@ -30,8 +30,8 @@ class << self
 	private :_eggshell_key_offsets, :_eggshell_key_offsets=
 end
 self._eggshell_key_offsets = [
-	0, 2, 38, 43, 44, 46, 49, 51, 
-	52, 54, 55, 56, 58, 68
+	0, 2, 39, 40, 41, 48, 49, 51, 
+	54, 56, 57, 59, 61, 62, 64, 74
 ]
 
 class << self
@@ -39,15 +39,16 @@ class << self
 	private :_eggshell_trans_keys, :_eggshell_trans_keys=
 end
 self._eggshell_trans_keys = [
-	48, 57, 13, 32, 34, 36, 38, 39, 
-	43, 44, 45, 46, 58, 59, 60, 61, 
-	62, 63, 64, 91, 92, 93, 94, 124, 
-	9, 10, 40, 41, 42, 47, 48, 57, 
-	65, 95, 97, 122, 123, 125, 95, 65, 
-	90, 97, 122, 38, 48, 57, 46, 48, 
-	57, 48, 57, 58, 60, 61, 61, 61, 
-	61, 62, 34, 91, 93, 110, 114, 116, 
-	123, 125, 39, 41, 124, 0
+	48, 57, 13, 32, 33, 34, 36, 38, 
+	39, 43, 44, 45, 46, 58, 59, 60, 
+	61, 62, 63, 64, 91, 92, 93, 94, 
+	124, 9, 10, 40, 41, 42, 47, 48, 
+	57, 65, 95, 97, 122, 123, 125, 61, 
+	126, 95, 48, 57, 65, 90, 97, 122, 
+	38, 48, 57, 46, 48, 57, 48, 57, 
+	58, 60, 61, 61, 126, 61, 61, 62, 
+	34, 91, 93, 110, 114, 116, 123, 125, 
+	39, 41, 124, 0
 ]
 
 class << self
@@ -55,8 +56,8 @@ class << self
 	private :_eggshell_single_lengths, :_eggshell_single_lengths=
 end
 self._eggshell_single_lengths = [
-	0, 22, 1, 1, 0, 1, 0, 1, 
-	0, 1, 1, 0, 8, 1
+	0, 23, 1, 1, 1, 1, 0, 1, 
+	0, 1, 0, 2, 1, 0, 8, 1
 ]
 
 class << self
@@ -64,8 +65,8 @@ class << self
 	private :_eggshell_range_lengths, :_eggshell_range_lengths=
 end
 self._eggshell_range_lengths = [
-	1, 7, 2, 0, 1, 1, 1, 0, 
-	1, 0, 0, 1, 1, 0
+	1, 7, 0, 0, 3, 0, 1, 1, 
+	1, 0, 1, 0, 0, 1, 1, 0
 ]
 
 class << self
@@ -73,8 +74,8 @@ class << self
 	private :_eggshell_index_offsets, :_eggshell_index_offsets=
 end
 self._eggshell_index_offsets = [
-	0, 2, 32, 36, 38, 40, 43, 45, 
-	47, 49, 51, 53, 55, 65
+	0, 2, 33, 35, 37, 42, 44, 46, 
+	49, 51, 53, 55, 58, 60, 62, 72
 ]
 
 class << self
@@ -82,15 +83,16 @@ class << self
 	private :_eggshell_indicies, :_eggshell_indicies=
 end
 self._eggshell_indicies = [
-	1, 0, 3, 3, 4, 5, 6, 4, 
-	9, 10, 9, 10, 12, 10, 13, 14, 
-	15, 8, 16, 17, 18, 17, 8, 20, 
-	3, 7, 8, 11, 5, 5, 19, 2, 
-	5, 5, 5, 21, 8, 22, 11, 23, 
-	25, 11, 24, 1, 26, 16, 27, 8, 
-	23, 28, 23, 8, 23, 8, 23, 29, 
-	29, 29, 29, 29, 29, 29, 29, 29, 
-	22, 8, 22, 0
+	1, 0, 3, 3, 4, 5, 6, 7, 
+	5, 10, 11, 10, 11, 13, 11, 14, 
+	15, 16, 9, 17, 18, 19, 18, 9, 
+	21, 3, 8, 9, 12, 6, 6, 20, 
+	2, 23, 22, 9, 24, 6, 6, 6, 
+	6, 25, 9, 22, 12, 24, 27, 12, 
+	26, 1, 28, 17, 29, 9, 24, 30, 
+	9, 24, 9, 24, 9, 24, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 22, 
+	9, 22, 0
 ]
 
 class << self
@@ -98,10 +100,10 @@ class << self
 	private :_eggshell_trans_targs, :_eggshell_trans_targs=
 end
 self._eggshell_trans_targs = [
-	1, 6, 1, 1, 1, 2, 3, 1, 
-	1, 4, 1, 5, 7, 8, 9, 11, 
-	1, 1, 12, 1, 13, 1, 1, 1, 
-	1, 0, 1, 1, 10, 1
+	1, 8, 1, 1, 2, 1, 4, 5, 
+	1, 1, 6, 1, 7, 9, 10, 11, 
+	13, 1, 1, 14, 1, 15, 1, 3, 
+	1, 1, 1, 0, 1, 1, 12, 1
 ]
 
 class << self
@@ -109,10 +111,10 @@ class << self
 	private :_eggshell_trans_actions, :_eggshell_trans_actions=
 end
 self._eggshell_trans_actions = [
-	39, 0, 25, 23, 15, 0, 0, 13, 
-	7, 0, 19, 5, 0, 0, 0, 0, 
-	17, 9, 0, 11, 0, 31, 37, 33, 
-	27, 0, 29, 35, 0, 21
+	39, 0, 25, 23, 0, 15, 0, 0, 
+	13, 7, 0, 19, 5, 0, 0, 0, 
+	0, 17, 9, 0, 11, 0, 37, 0, 
+	33, 31, 27, 0, 29, 35, 0, 21
 ]
 
 class << self
@@ -121,7 +123,7 @@ class << self
 end
 self._eggshell_to_state_actions = [
 	0, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0
 ]
 
 class << self
@@ -130,7 +132,7 @@ class << self
 end
 self._eggshell_from_state_actions = [
 	0, 3, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0
 ]
 
 class << self
@@ -138,8 +140,8 @@ class << self
 	private :_eggshell_eof_trans, :_eggshell_eof_trans=
 end
 self._eggshell_eof_trans = [
-	1, 0, 22, 23, 24, 25, 27, 28, 
-	24, 24, 24, 24, 23, 23
+	1, 0, 23, 25, 26, 23, 25, 27, 
+	29, 30, 25, 25, 25, 25, 23, 23
 ]
 
 class << self
@@ -161,7 +163,7 @@ end
 self.eggshell_en_main = 1;
 
 
-# line 80 "lexer.ragel"
+# line 80 "lib/eggshell/expression-evaluator/lexer.ragel"
 		# %
 	end
 	
@@ -169,7 +171,7 @@ self.eggshell_en_main = 1;
 		data = source.is_a?(String) ? source.unpack("c*") : source
 		eof = data.length
 		
-# line 173 "lexer.rb"
+# line 175 "lib/eggshell/expression-evaluator/lexer.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -179,9 +181,9 @@ begin
 	act = 0
 end
 
-# line 87 "lexer.ragel"
+# line 87 "lib/eggshell/expression-evaluator/lexer.ragel"
 		
-# line 185 "lexer.rb"
+# line 187 "lib/eggshell/expression-evaluator/lexer.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -211,7 +213,7 @@ begin
 		begin
 ts = p
 		end
-# line 215 "lexer.rb"
+# line 217 "lib/eggshell/expression-evaluator/lexer.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
@@ -284,7 +286,7 @@ when 2 then
 te = p+1
 		end
 when 3 then
-# line 31 "lexer.ragel"
+# line 31 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -292,7 +294,7 @@ te = p+1
 		 end
 		end
 when 4 then
-# line 35 "lexer.ragel"
+# line 35 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -300,7 +302,7 @@ te = p+1
 		 end
 		end
 when 5 then
-# line 39 "lexer.ragel"
+# line 39 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -308,7 +310,7 @@ te = p+1
 		 end
 		end
 when 6 then
-# line 43 "lexer.ragel"
+# line 43 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -316,7 +318,7 @@ te = p+1
 		 end
 		end
 when 7 then
-# line 47 "lexer.ragel"
+# line 47 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -324,7 +326,7 @@ te = p+1
 		 end
 		end
 when 8 then
-# line 51 "lexer.ragel"
+# line 51 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -332,7 +334,7 @@ te = p+1
 		 end
 		end
 when 9 then
-# line 55 "lexer.ragel"
+# line 55 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -340,7 +342,7 @@ te = p+1
 		 end
 		end
 when 10 then
-# line 59 "lexer.ragel"
+# line 59 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -348,7 +350,7 @@ te = p+1
 		 end
 		end
 when 11 then
-# line 63 "lexer.ragel"
+# line 63 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -356,7 +358,7 @@ te = p+1
 		 end
 		end
 when 12 then
-# line 67 "lexer.ragel"
+# line 67 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p+1
  begin 
@@ -364,7 +366,7 @@ te = p+1
 		 end
 		end
 when 13 then
-# line 19 "lexer.ragel"
+# line 19 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p
 p = p - 1; begin  
@@ -372,7 +374,7 @@ p = p - 1; begin
 		 end
 		end
 when 14 then
-# line 23 "lexer.ragel"
+# line 23 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p
 p = p - 1; begin  
@@ -380,7 +382,7 @@ p = p - 1; begin
 		 end
 		end
 when 15 then
-# line 27 "lexer.ragel"
+# line 27 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p
 p = p - 1; begin  
@@ -388,7 +390,7 @@ p = p - 1; begin
 		 end
 		end
 when 16 then
-# line 31 "lexer.ragel"
+# line 31 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p
 p = p - 1; begin 
@@ -396,7 +398,7 @@ p = p - 1; begin
 		 end
 		end
 when 17 then
-# line 51 "lexer.ragel"
+# line 51 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p
 p = p - 1; begin 
@@ -404,7 +406,7 @@ p = p - 1; begin
 		 end
 		end
 when 18 then
-# line 67 "lexer.ragel"
+# line 67 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
 te = p
 p = p - 1; begin 
@@ -412,14 +414,14 @@ p = p - 1; begin
 		 end
 		end
 when 19 then
-# line 19 "lexer.ragel"
+# line 19 "lib/eggshell/expression-evaluator/lexer.ragel"
 		begin
  begin p = ((te))-1; end
  begin  
 			@parser.emit(:number_literal, data, ts, te) 
 		 end
 		end
-# line 423 "lexer.rb"
+# line 425 "lib/eggshell/expression-evaluator/lexer.rb"
 			end # action switch
 		end
 	end
@@ -439,7 +441,7 @@ when 0 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-# line 443 "lexer.rb"
+# line 445 "lib/eggshell/expression-evaluator/lexer.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
@@ -466,7 +468,7 @@ end
 	end
 	end
 
-# line 88 "lexer.ragel"
+# line 88 "lib/eggshell/expression-evaluator/lexer.ragel"
 		# %
 	end
 end

data/lib/eggshell/expression-evaluator/parser.rb

@@ -15,6 +15,23 @@ module Parser
 	ST_ARRAY = 256
 	ST_INDEX_ACCESS = ST_ARRAY|ST_LABEL
 	
+	STATE_NAMES = {
+		0 => 'null',
+		1 => 'number',
+		2 => 'string',
+		4 => 'string_expression',
+		8 => 'string_block',
+		16 => 'label',
+		17 => 'label_call',
+		19 => 'label_member',
+		32 => 'operator',
+		33 => 'operator_tern',
+		64 => 'group',
+		128 => 'hash',
+		256 => 'array',
+		ST_INDEX_ACCESS => 'index_access'	
+	}.freeze
+	
 	CONSTS = {
 		'true' => true,
 		'false' => false,
@@ -50,9 +67,17 @@ module Parser
 		end
 
 		def emit(type, data = nil, ts = nil, te = nil)
+			lst = @state[-1]
+			# pop last state if appropriate
+			if type == :end
+				while @state[-1] == ST_OPERATOR || @state[-1] == ST_OPERATOR_TERN
+					@state.pop
+				end
+				return
+			end
+
 			word = data[ts...te].pack('c*')
 			@tokens << word # if type != :space
-			lst = @state[-1]
 			
 			# before inserting term, need to make sure it follows semantics of function/array
 			# @todo look out for case of '(,' or '[,'
@@ -143,7 +168,10 @@ module Parser
 			elsif type == :logical_op
 				# STORED AS: `[:op, [operand1, operator1, operand2, operator2, ...]]
 				# > @last_ptr holds entire structure, @ptr holds structure[1]
-				# @todo deal with - prefix
+				# @todo deal with '-' prefix
+				
+				# direct assignment unsupported for now, cast to equivalence
+				word = '==' if word == '='
 				@term_last.pop
 				raise Exception.new("expecting identifier after '#{@ptr[-1][1]}'") if @expect_label
 				if word == '?'
@@ -349,7 +377,7 @@ module Parser
 				end
 			elsif type == :space
 			else
-				puts "woooo"
+				$stderr.write "! parser else: #{word}\n"
 			end
 		end
 		
@@ -357,19 +385,34 @@ module Parser
 			reset
 			begin
 				@lexer.process(src)
+				emit(:end)
+				if @state[-1] != ST_NULL
+					err = []
+					@state[1..-1].each do |st|
+						err << STATE_NAMES[st]
+					end
+					raise Exception.new("Unbalanced state: #{err.join(' -> ')}")
+				end
 				@tree
-			rescue => ex
-				$stderr.write("parse exception: #{ex}\n")
+			rescue Exception => ex
+				$stderr.write("WARN: returning nil, parse exception for: #{src}\n#{ex}\n")
 				$stderr.write("\t#{ex.backtrace.join("\n\t")}\n")
+				debug
 				nil
 			end
 		end
 		
-		def debug
-			puts "STATE : #{@state.inspect}"
-			puts "TREE  : #{@tree.inspect}"
-			puts "  PTR : #{@ptr.inspect}"
-			puts "TOKENS: #{@tokens.inspect}"
+		def debug(io = nil)
+			io = $stderr if !io
+			io.write "STATE : "
+			@state.each do |st|
+				io.write STATE_NAMES[st]
+				io.write ", "
+			end
+			io.write "\n"
+			io.write "TREE  : #{@tree.inspect}\n"
+			io.write "  PTR : #{@ptr.inspect}\n"
+			io.write "TOKENS: #{@tokens.inspect}\n"
 		end
 	end
 	

data/lib/eggshell/parse-tree.rb

@@ -39,7 +39,7 @@ class Eggshell::ParseTree
 
 		if delim
 			@modes << (mode == MH::COLLECT_RAW_MACRO ? :macro_raw : macro)
-			@macro_delims << delim.reverse.gsub('[', ']').gsub('(', ')').gsub('{', '}')
+			@macro_delims << delim #delim.reverse.gsub('[', ']').gsub('(', ')').gsub('{', '}')
 			@macro_open << line
 			@macro_ptr << @ptr
 			# set ptr to entry's tree
@@ -59,7 +59,7 @@ class Eggshell::ParseTree
 			@macro_delims.pop
 			@macro_open.pop
 			@ptr = @macro_ptr.pop
-			@ptr[-1] << line_num
+			@ptr[-1][-1] = line_num
 			last_mode = @modes.pop
 			return true
 		end
@@ -90,7 +90,7 @@ class Eggshell::ParseTree
 	end
 
 	def push_block
-		if @modes[-1] == :block
+		if @modes[-1] == :block || @modes[-1] == :raw
 			if @cur_block
 				line_end = @cur_block[3]
 				line_end = @lines[-1].line_num if @lines[-1]

data/lib/eggshell/processor.rb

@@ -302,7 +302,7 @@ module Eggshell
 					
 					line_norm = Line.new(line, tab_str, _ind, line_start, oline.chomp)
 					line_start = line_count
-
+#$stderr.write ">> mode(#{parse_tree.mode}): #{line}\n"
 					if parse_tree.mode == :raw
 						stat = parse_tree.collect(line_norm)
 						next if stat != BH::RETRY
@@ -317,6 +317,7 @@ module Eggshell
 					# macro processing
 					if line[0] == '@'
 						macro, args, delim = parse_macro_start(line)
+						#$stderr.write "-- macro: #{macro} (#{line})\n"
 						mhandler = get_macro_handler(macro)
 						parse_tree.new_macro(line_norm, line_count, macro, args, delim, mhandler ? mhandler.collection_type(macro) : nil)
 						next
@@ -400,7 +401,6 @@ module Eggshell
 			last_line = 0
 			last_macro = nil
 			deferred = nil
-
 			parse_tree.each do |unit|
 				if unit.is_a?(String)
 					out << unit
@@ -418,11 +418,11 @@ module Eggshell
 						_warn "handler not found: #{unit[0]} -> #{unit[1]}"
 						next
 					end
-
+					#$stderr.write "#{unit[0]}:#{unit[1]}\n\t#{unit[2].inspect}\n"
 					args_o = unit[2] || []
 					args = []
 					args_o.each do |arg|
-						args << (arg.is_a?(Array) ? @@ee.evaluate([:array, arg]) : arg)
+						args << (arg.is_a?(Array) ? @ee.evaluate([arg]) : arg)
 					end
 
 					lines = unit[ParseTree::IDX_LINES]
@@ -621,6 +621,8 @@ module Eggshell
 			[block_type, args, line]
 		end
 
+		# @todo enhancement #1: allow same-line nesting of macros like `@macro(...) { @macro2 {` (and
+		# make sure to handle closing on same line like `} }`)
 		def parse_macro_start(line)
 			macro = nil
 			args = []
@@ -628,21 +630,26 @@ module Eggshell
 
 			# either macro is a plain '@macro' or it has parameters/opening brace
 			if line.index(' ') || line.index('(') || line.index('{')
+				# remove the end delimiter
+				m = line.match(/(\{[\/\(\[a-z]*)\s*$/)
+				if m
+					line = line[0...line.rindex(m[1])]
+				end
+				line = line[1..-1]
 				# since the macro statement is essentially a function call, parse the line as an expression to get components
 				expr_struct = @ee.parse(line)
 				fn = expr_struct.shift
-
 				if fn.is_a?(Array) && (fn[0] == :func || fn[0] == :var)
 					macro = fn[1]
 					args = fn[2] # @@ee.evaluate([:array, fn[2]])
-					if expr_struct[-1].is_a?(Array) && expr_struct[-1][0] == :brace_op
-						delim = expr_struct[-1][1]
+					if m
+						delim = m[1].reverse.gsub('{', '}').gsub('[', ']').gsub('(', ')')
 					end
 				end
 			else
 				macro = line[1..line.length]
 			end
-			
+
 			[macro, args, delim]
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eggshell
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kaiser Shahid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies: []
 description: From fast and basic HTML to complex decouments and more, Eggshell aims
   to provide you with all the document generation power you need through simple markup.