wexpr 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8b55a4735e41d357d92c7e95ee0479c41302d598d1a19fa3966ba9574415d1
-  data.tar.gz: f3b5c73222ed2aa54363386901db181fe29658498668dff85d9f0796161d7e58
+  metadata.gz: 7d69b8945baa9211cb2b896fdf425c0dc403e06a55599d0ebf917fa49e47c3e7
+  data.tar.gz: 9409bd300351110d65e637de80509d3402eeecbb4896c6349ebf8660b5f1338c
 SHA512:
-  metadata.gz: f0b8308c9fa61b765d1250fb9ce68500c066b0a36e74027409f5fe6c421b4eac10872ceb9180899241636f35a5109532eb5b0c81fbd7f50092b5b7865d06785b
-  data.tar.gz: 68be1b7ca0e0b81ec719fee3dcf1e05a16ebb5f8dd944231f75c753b22d3bf9ff99c04f20a3e441dd86c8680f5c3a66f27e5009e1fd275b2fa1c20bf2c76358d
+  metadata.gz: cc3f65916ce7267cc67cbd0461163f7e6fde51f6a7bfc02a5b249776fefebef0a74e83a3871e09ab6c912a3c77523e549b15d440ab7626df7c2438e7c59eb106
+  data.tar.gz: 035c0f7df69a0b73241f8e839885bca8a392d1b5ddf6c6d079a3f1af297124e4e4153b5029bba4e0797a4ff496076c24e74e1285e64ac0765e742b57c155b5a7

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    wexpr (0.1.0)
+    wexpr (0.1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.11.3)
-    rake (10.5.0)
+    rake (12.3.3)
 
 PLATFORMS
   ruby
@@ -15,7 +15,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 12.3)
   wexpr!
 
 BUNDLED WITH

data/bin/wexprTool

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "wexpr"
+require_relative "../lib/wexpr"
 
 require 'optparse'
 

data/lib/wexpr/exception.rb

@@ -44,6 +44,9 @@ module Wexpr
 	class MapNoValueError < Exception
 	end
 	
+	class StringMissingQuoteError < Exception
+	end
+
 	class ReferenceMissingEndBracketError < Exception
 	end
 	

data/lib/wexpr/expression.rb

@@ -170,8 +170,15 @@ module Wexpr
 					end
 					
 				else
-					# might be a number or something else, to_s it
-					return Expression.create_value(variable.to_s)
+					# see if we support to_wexpr
+					# if so, decode it with :returnAsExpression
+					if variable.class.method_defined?(:to_wexpr) && variable.method(:to_wexpr).owner != Object
+						# use that method
+						return variable.to_wexpr([:returnAsExpression])
+					else
+						# might be a number or something else, to_s it
+						return Expression.create_value(variable.to_s)
+					end
 			end
 		end
 		
@@ -199,7 +206,7 @@ module Wexpr
 			
 			# then init
 			if @type == :value
-				@value = ""
+				@value = "".freeze
 			elsif @type == :binarydata
 				@binarydata = ""
 			elsif @type == :array
@@ -343,7 +350,7 @@ module Wexpr
 				return
 			end
 			
-			@value = str
+			@value = str.dup.freeze
 		end
 		
 		# --- Binary Data
@@ -539,19 +546,13 @@ module Wexpr
 		end
 		
 		def self.s_is_not_bareword_safe(c)
-			return (c == '*'               \
-				or c == '#'                \
-				or c == '@'                \
-				or c == '(' or c == ')'    \
-				or c == '[' or c == ']'    \
-				or c == '^'                \
-				or c == '<' or c == '>'    \
-				or c == '"'                \
-				or c == ';'                \
-				or self.s_is_whitespace(c) \
-			)
+			return /^(\*|\#|\@|\(|\)|\[|\]|\^|<|>|"|;|\s)$/.match? c
 		end
 		
+		def self.s_index_of_first_non_bareword(s, startIndex)
+			return s.index(/(\*|\#|\@|\(|\)|\[|\]|\^|<|>|"|;|\s)/, startIndex)
+		end
+
 		def self.s_is_escape_valid(c)
 			return (c == '"' || c == 'r' || c == 'n' || c == 't' || c == "\\")
 		end
@@ -640,11 +641,6 @@ module Wexpr
 		
 		# will copy out the value of the string to a new buffer, will parse out quotes as needed
 		def self.s_create_value_of_string(str, parserState)
-			# two pass:
-			# first pass, get the length of the size
-			# second pass, store the buffer
-			
-			bufferLength = 0
 			isQuotedString = false
 			isEscaped = false
 			pos = 0 # position we're parsing at
@@ -654,91 +650,75 @@ module Wexpr
 				pos += 1
 			end
 			
-			while pos < str.size
-				c = str[pos]
-				
-				if isQuotedString
-					if isEscaped
-						# we're in an escape. Is it valid?
-						if self.s_is_escape_valid(c)
-							bufferLength += 1 # counts
-							isEscaped = false # escape ended
-						else
-							raise InvalidStringEscapeError.new(parserState.line, parserState.column, "Invalid escape found in the string")
-						end
-					else
-						if c == '"'
-							# end quote, part of us
-							pos += 1
-							break
-						elsif c == "\\"
-							# we're escaping
-							isEscaped = true
-						else
-							# otherwise it's a character
-							bufferLength += 1
-						end
-					end
-				else
-					# have we ended the word?
-					if self.s_is_not_bareword_safe(c)
-						# ended - not part of us
-						break
-					end
-					
-					# otherwise, its a character
-					bufferLength += 1
-				end
-				
-				pos += 1
-			end
-			
-			if bufferLength == 0 and !isQuotedString # cannot have an empty barewords string
-				raise EmptyStringError.new(parserState.line, parserState.column, "Was told to parse an empty string")
-			end
-			
-			endVal = pos
-			
-			# we now know our buffer size and the string has been checked
-			# ... not that we needed this in ruby
+			# parse out and write the string
 			buffer = ""
 			writePos = 0
 			pos = 0
 			if isQuotedString
 				pos = 1
-			end
-			
-			while writePos < bufferLength
-				c = str[pos]
-			
-				if isQuotedString
+				while pos < str.size
 					if isEscaped
+						c = str[pos]
 						escapedValue = self.s_value_for_escape(c)
 						buffer[writePos] = escapedValue
 						writePos += 1
 						isEscaped = false
 					else
-						if c == "\\"
+						# move forward to the next escape or end of string
+						ni = str.index(/["\\]/, pos)
+						if ni == nil
+							# uhhhh no possible end to string - missing a quote?
+							raise StringMissingQuoteError.new(parserState.line, parserState.column, "String was quoted, but couldnt find an ending quote")
+						end
+
+						# otherwise, copy up to the pos
+						if ni != 0
+							sub = str[pos..ni-1]
+							buffer += sub
+							pos += sub.size
+							writePos += sub.size
+						end
+
+						# Now we're on top of a special character
+						c = str[pos]
+						if c == '"'
+							# end quote, part of us and we're done
+							pos += 1
+							break
+						elsif c == "\\"
 							# we're escaping
 							isEscaped = true
 						else
-							# otherwise it's a character
-							buffer[writePos] = c
-							writePos += 1
+							raise StandardError.new("INTERNAL ERROR: reached a special character, but not an expected special character??? (was: #{c} at #{pos})")
 						end
 					end
 					
+					# next character
+					pos += 1
+				end
+			else # !isQuotedString
+
+				# figure out where we would end the word
+				sub = str[pos..-1]
+				i = self.s_index_of_first_non_bareword(sub, pos)
+				if i == nil
+					# entire rest is fine
+					buffer += sub
+					pos += sub.size
+					writePos += sub.size
 				else
-					# it's a character
-					buffer[writePos] = c
-					writePos += 1
+					# up to i is fine
+					buffer += sub[0..i-1]
+					pos += i
+					writePos += i
 				end
-				
-				# next character
-				pos += 1
 			end
-			
-			return buffer, endVal
+
+			if writePos == 0 and !isQuotedString # cannot have an empty barewords string
+				raise EmptyStringError.new(parserState.line, parserState.column, "Was told to parse an empty string")
+			end
+
+			return buffer, pos
 		end
 		
 		# returns information about a string
@@ -943,7 +923,7 @@ module Wexpr
 		# will load into self, setting up everything. Assumes we're empty/null to start.
 		def p_parse_from_string(str, parseFlags, parserState)
 			if str.size == 0
-				raise EmptyStringError(parserState.line, parserState.column, "Was told to parse an empty string")
+				raise EmptyStringError.new(parserState.line, parserState.column, "Was told to parse an empty string")
 			end
 			
 			# now we parse
@@ -1022,7 +1002,7 @@ module Wexpr
 						str = keyExpression.p_parse_from_string(str, parseFlags, parserState)
 						
 						if keyExpression.type != :value
-							raise MapKeyMustBeAValueError.new(prevLine, prevColumn, "Map keys must be a value")
+							raise MapKeyMustBeAValueError.new(prevLine, prevColumn, "Map keys must be a value: was #{keyExpression.type}")
 						end
 						
 						valueExpression = Expression.create_invalid()
@@ -1157,7 +1137,7 @@ module Wexpr
 					@type = :null
 				else
 					@type = :value
-					@value = val
+					@value = val.dup.freeze
 				end
 				
 				parserState.move_forward_based_on_string(str[0..endPos-1])
@@ -1169,6 +1149,34 @@ module Wexpr
 			return ""
 		end
 		
+		##
+		# Will write the string escaped, and with quotes
+		# around it if needed.
+		#
+		def self.s_write_string_escaped(v, props)
+			buf = ''
+
+			if not props[:isbarewordsafe]
+				buf += '"'
+			end
+				
+			# do per character so we can escape as needed
+			for c in v.chars
+				if Expression.s_requires_escape(c)
+					buf += "\\"
+					buf += Expression.s_escape_for_value(c)
+				else
+					buf += c
+				end
+			end
+				
+			if not props[:isbarewordsafe]
+				buf += '"'
+			end
+
+			return buf
+		end
+
 		# NOTE THESE BUFFERS ARE ACTUALLY MUTABLE
 		#
 		# Human Readable notes:
@@ -1191,23 +1199,7 @@ module Wexpr
 				v = self.value
 				props = Expression.s_wexpr_value_string_properties(v)
 				
-				if not props[:isbarewordsafe]
-					newBuf += '"'
-				end
-				
-				# do per character so we can escape as needed
-				for c in v.chars
-					if Expression.s_requires_escape(c)
-						newBuf += "\\"
-						newBuf += Expression.s_escape_for_value(c)
-					else
-						newBuf += c
-					end
-				end
-				
-				if not props[:isbarewordsafe]
-					newBuf += '"'
-				end
+				newBuf += Expression.s_write_string_escaped(v, props)
 				
 				return newBuf
 				
@@ -1301,7 +1293,7 @@ module Wexpr
 					# if human readable, indent the line, output the key, space, object, newline
 					if writeHumanReadable
 						newBuf += Expression.s_indent(indent+1)
-						newBuf += key
+						newBuf += Expression.s_write_string_escaped(key, Expression.s_wexpr_value_string_properties(key))
 						newBuf += " "
 						
 						# add the value
@@ -1317,7 +1309,7 @@ module Wexpr
 						end
 						
 						# now key, space, value
-						newBuf += key
+						newBuf += Expression.s_write_string_escaped(key, Expression.s_wexpr_value_string_properties(key))
 						newBuf += " "
 						
 						newBuf = value.p_append_string_representation_to_buffer(flags, indent, newBuf)

data/lib/wexpr/version.rb

@@ -1,3 +1,3 @@
 module Wexpr
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

data/lib/wexpr.rb

@@ -1,8 +1,8 @@
-require 'wexpr/exception'
-require 'wexpr/expression'
-require 'wexpr/object_ext'
-require 'wexpr/uvlq64'
-require 'wexpr/version'
+require_relative 'wexpr/exception'
+require_relative 'wexpr/expression'
+require_relative 'wexpr/object_ext'
+require_relative 'wexpr/uvlq64'
+require_relative 'wexpr/version'
 
 #
 # Ruby-Wexpr library
@@ -21,12 +21,16 @@ module Wexpr
 	
 	#
 	# Emit a hash as the equivilant wexpr string, human readable or not.
-	# See possible writeflags in Expression.
+	# See possible writeflags in Expression. We also support :returnAsExpression which will return the expression, and not the string (for internal use).
 	#
 	def self.dump(variable, writeFlags=[])
 		# first step, go through the variable and create the equivilant wexpr expressions
 		expr = Expression::create_from_ruby(variable)
 		
+		if writeFlags.include? :returnAsExpression
+			return expr
+		end
+		
 		# then have it write out the string
 		return expr.create_string_representation(0, writeFlags)
 	end

data/wexpr.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.0"
   
   spec.required_ruby_version = '>= 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wexpr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Kenneth Perry (thothonegan)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Wexpr parser and emitter for ruby