theta 0.1.1 → 0.1.2

data/README.rdoc

@@ -19,6 +19,6 @@ After installation, simply type theta to get to the interactive interpreter prom
 	theta> (square 3)
 	9
 	
-To exit, simply press enter on a blank line.
+To exit, simply type 'exit' at the prompt.
 
 It's a little low on features currently, but I'll be adding more eventually!

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/theta/interpreter.rb

@@ -22,10 +22,10 @@ module Theta
 			end
 		end
 
-		# run a line of code
+		# run some code
 		def run(program)
-			expressions = parse(program)
-			return evaluate(expressions)
+			expression = parse(program)
+			return evaluate(expression)
 		end
 
 		# call the parser to make a string interpretable

data/lib/theta/library/equality.scm

@@ -0,0 +1,11 @@
+(define =
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			arguments.each do |arg|
+				if not interpreter.evaluate(arg) == interpreter.evaluate(arguments[0])
+					return false
+				end
+			end
+		}
+	")
+)

data/lib/theta/library/greater_than.scm

@@ -0,0 +1,13 @@
+(define >
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			args_to_compare = arguments[1, arguments.length]
+			args_to_compare.each do |arg|
+				if not interpreter.evaluate(arguments[0]) > interpreter.evaluate(arg)
+					return false
+				end
+			end
+			return true
+		}
+	")
+)

data/lib/theta/library/greater_than_or_equal.scm

@@ -0,0 +1,13 @@
+(define >=
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			args_to_compare = arguments[1, arguments.length]
+			args_to_compare.each do |arg|
+				if not interpreter.evaluate(arguments[0]) >= interpreter.evaluate(arg)
+					return false
+				end
+			end
+			return true
+		}
+	")
+)

data/lib/theta/library/if.scm

@@ -0,0 +1,13 @@
+(define if
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			if interpreter.evaluate(arguments[0])
+				interpreter.evaluate(arguments[1])
+			else
+				if not arguments[2].nil?
+					interpreter.evaluate(arguments[2])
+				end
+			end
+		}
+	")
+)

data/lib/theta/library/less_than.scm

@@ -0,0 +1,13 @@
+(define <
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			args_to_compare = arguments[1, arguments.length]
+			args_to_compare.each do |arg|
+				if not interpreter.evaluate(arguments[0]) < interpreter.evaluate(arg)
+					return false
+				end
+			end
+			return true
+		}
+	")
+)

data/lib/theta/library/less_than_or_equal.scm

@@ -0,0 +1,13 @@
+(define <=
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			args_to_compare = arguments[1, arguments.length]
+			args_to_compare.each do |arg|
+				if not interpreter.evaluate(arguments[0]) <= interpreter.evaluate(arg)
+					return false
+				end
+			end
+			return true
+		}
+	")
+)

data/lib/theta/library/set.scm

@@ -0,0 +1,10 @@
+(define set!
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			if interpreter.current_environment.find(arguments[0]).nil?
+				raise 'Variable ' + arguments[0] + ' is undefined'
+			end
+			interpreter.current_environment.define(arguments[0], arguments[1])
+		}
+	")
+)

data/lib/theta/parser.rb

@@ -12,7 +12,11 @@ module Theta
 			tokens = []
 			found_string = false
 			temp = ""
+			# loop through each character passed
 			string.each_char do |char|
+				# if we're currently in a string and we hit the quote,
+				# it's the end of the string.
+				# move the string into the token array
 				if found_string
 					if char == "\""
 						found_string = false
@@ -21,10 +25,13 @@ module Theta
 							tokens << temp
 						end
 						temp = ""
+					# otherwise add the character to the temporary variable
 					else
 						temp << char
 					end
 				else
+					# if we hit parentheses, add whatever's in temp as a token
+					# then add the parentheses as a token
 					if char == "(" || char == ")"
 						if not temp.empty?
 							tokens << temp
@@ -32,19 +39,25 @@ module Theta
 						end
 						tokens << char
 						next
+					# if we hit a quote, we're beginning a string
+					# flip the found_string flag and begin adding to the temp variable
 					elsif char == "\""
 						found_string = true
 						temp << char
+					# space signals the end of a token, push the temp variable on the token queue
 					elsif char == " "
 						if not temp.empty?
 							tokens << temp
 						end
 						temp = ""
+					# ignore tabs or newlines, unless there's something in temp
+					# push that onto tokens
 					elsif char == "\t" || char == "\n"
 						if not temp.empty?						
 							tokens << temp
 						end
 						temp = ""
+					# add the character to temp to build a token
 					else
 						temp << char
 					end

data/lib/theta.rb

@@ -20,11 +20,14 @@ module Theta
 		def repl
 			while true
 				print "theta> "
-				input = gets
-				input.strip!
-				if input.empty?
+				input = ""
+				input << gets.strip
+				if input == "exit"
 					puts "Exiting..."
-					break
+					return
+				end
+				if input.empty?
+					next
 				end
 				value = @interpreter.run(input)
 				unless value.nil?

data/theta.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{theta}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris O'Neal"]
@@ -31,8 +31,15 @@ Gem::Specification.new do |s|
     "lib/theta/interpreter.rb",
     "lib/theta/library/add.scm",
     "lib/theta/library/divide.scm",
+    "lib/theta/library/equality.scm",
+    "lib/theta/library/greater_than.scm",
+    "lib/theta/library/greater_than_or_equal.scm",
+    "lib/theta/library/if.scm",
     "lib/theta/library/lambda.scm",
+    "lib/theta/library/less_than.scm",
+    "lib/theta/library/less_than_or_equal.scm",
     "lib/theta/library/multiply.scm",
+    "lib/theta/library/set.scm",
     "lib/theta/library/subtract.scm",
     "lib/theta/parser.rb",
     "test/helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theta
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &9486048 !ruby/object:Gem::Requirement
+  requirement: &9485220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9486048
+  version_requirements: *9485220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9485316 !ruby/object:Gem::Requirement
+  requirement: &9484644 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9485316
+  version_requirements: *9484644
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9484296 !ruby/object:Gem::Requirement
+  requirement: &9483744 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *9484296
+  version_requirements: *9483744
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &9479136 !ruby/object:Gem::Requirement
+  requirement: &9483072 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9479136
+  version_requirements: *9483072
 description: Theta was created as a learning project based off of lis.py and flea
 email: ctoneal@gmail.com
 executables:
@@ -79,8 +79,15 @@ files:
 - lib/theta/interpreter.rb
 - lib/theta/library/add.scm
 - lib/theta/library/divide.scm
+- lib/theta/library/equality.scm
+- lib/theta/library/greater_than.scm
+- lib/theta/library/greater_than_or_equal.scm
+- lib/theta/library/if.scm
 - lib/theta/library/lambda.scm
+- lib/theta/library/less_than.scm
+- lib/theta/library/less_than_or_equal.scm
 - lib/theta/library/multiply.scm
+- lib/theta/library/set.scm
 - lib/theta/library/subtract.scm
 - lib/theta/parser.rb
 - test/helper.rb
@@ -101,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1029420371
+      hash: -933902079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: