theta 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,20 +1,20 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  shoulda
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rcov (0.9.9)
+    shoulda (2.11.3)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.5.2)
+  rcov
+  shoulda

data/README.rdoc

@@ -15,8 +15,9 @@ After installation, simply type theta to get to the interactive interpreter prom
 	2
 	theta> (+ a 3)
 	5
-	theta> (- 6 a)
-	4
+	theta> (define square (lambda (x) (* x x)))
+	theta> (square 3)
+	9
 	
 To exit, simply press enter on a blank line.
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/theta/environment.rb

@@ -2,6 +2,9 @@ module Theta
 	# An environment, stores defined items for a
 	# particular level
 	class Environment
+	
+		attr_accessor :parent
+		
 		def initialize(parent = nil)
 			@parent = parent
 			@table = {}

data/lib/theta/interpreter.rb

@@ -2,9 +2,11 @@ module Theta
 	# interpret scheme code
 	class Interpreter
 
+		attr_accessor :current_environment
+		
 		#initialize the environment and the parser
 		def initialize
-			@global_environment = Environment.new
+			@global_environment = @current_environment = Environment.new
 			@parser = Parser.new
 			load_library
 		end
@@ -37,23 +39,33 @@ module Theta
 		end
 
 		# evaluate the scheme expression
-		def evaluate(expression, environment=@global_environment)
+		def evaluate(expression)
 			if expression.is_a? Symbol
-				return environment.find(expression)
+				return @current_environment.find(expression)
 			elsif not expression.is_a? Array
 				return expression
 			end
+
+			if expression.count == 1
+				if expression.is_a? Symbol
+					return @current_environment.find(expression[0])
+				else
+					return expression[0]
+				end
+			end
+
 			case expression[0]
 			when :define
-				return environment.define(expression [1], evaluate(expression[2], environment))
+				return @current_environment.define(expression [1], evaluate(expression[2]))
 			when :ruby_func
 				return eval expression[1]
 			else
-				function = evaluate(expression[0], environment)
-				if function.lambda?
+				function = evaluate(expression[0])
+				if function.is_a? Proc
 					arguments = expression[1, expression.length]
-					function.call(arguments, self)
+					return function.call(arguments, self)
 				else
+					raise RuntimeError, "#{expression[0]} is not a function"
 				end
 			end
 		end

data/lib/theta/library/add.scm

@@ -1,8 +1,8 @@
-( define + 
+(define + 
 	(ruby_func "
 		lambda { |arguments, interpreter|
-			temp = arguments.map { |item| interpreter.evaluate(item) };
-			temp.inject { |result, n| result + n};
+			temp = arguments.map { |item| interpreter.evaluate(item) }
+			temp.inject { |result, n| result + n}
 		}
 	")
 )

data/lib/theta/library/divide.scm

@@ -1,8 +1,8 @@
 (define /
 	(ruby_func "
 		lambda { |arguments, interpreter|
-			temp = arguments.map { |item| interpreter.evaluate(item) };
-			temp.inject { |result, n| result / n};
+			temp = arguments.map { |item| interpreter.evaluate(item) }
+			temp.inject { |result, n| result / n}
 		}
 	")
-)
+)

data/lib/theta/library/lambda.scm

@@ -0,0 +1,39 @@
+(define lambda
+	(ruby_func "
+		lambda { |arguments, interpreter|
+			parameters = arguments[0]
+			body = arguments[1, arguments.length]
+			if parameters.is_a? Array
+				if parameters.length != parameters.uniq.length
+					raise 'Parameters declared more than once'
+				end
+			end
+			
+			lambda_environment = Theta::Environment.new(interpreter.current_environment)
+			
+			execute = lambda { |body, environment, interpreter|
+				interpreter.current_environment = environment
+				result = nil
+				body.each do |expression|
+					result = interpreter.evaluate(expression)
+				end
+				interpreter.current_environment = environment.parent
+				return result
+			}
+			if parameters.is_a? Array
+				lambda { |arguments, interpreter|
+					parameters.each_index do |x|
+						lambda_environment.define(parameters[x], interpreter.evaluate(arguments[x]))
+					end
+					execute.call(body, lambda_environment, interpreter)
+				}
+			elsif parameters.is_a? Symbol
+				lambda { |arguments, interpreter|
+					arguments.map! { |x| interpreter.evaluate(x) }
+					lambda_environment.define(parameters, arguments)
+					execute.call(body, lambda_environment, interpreter)
+				}
+			end
+		}
+	")
+)

data/lib/theta/library/multiply.scm

@@ -1,8 +1,8 @@
 (define *
 	(ruby_func "
 		lambda { |arguments, interpreter|
-			temp = arguments.map { |item| interpreter.evaluate(item) };
-			temp.inject { |result, n| result * n};
+			temp = arguments.map { |item| interpreter.evaluate(item) }
+			temp.inject { |result, n| result * n}
 		}
 	")
-)
+)

data/lib/theta/library/subtract.scm

@@ -1,8 +1,8 @@
 (define -
 	(ruby_func "
 		lambda { |arguments, interpreter|
-			temp = arguments.map { |item| interpreter.evaluate(item) };
-			temp.inject { |result, n| result - n};
+			temp = arguments.map { |item| interpreter.evaluate(item) }
+			temp.inject { |result, n| result - n}
 		}
 	")
-)
+)

data/lib/theta/parser.rb

@@ -9,7 +9,48 @@ module Theta
 	
 		# converts a string into an array of tokens
 		def tokenize(string)
-			return string.gsub("(", " ( ").gsub(")", " ) ").split
+			tokens = []
+			found_string = false
+			temp = ""
+			string.each_char do |char|
+				if found_string
+					if char == "\""
+						found_string = false
+						temp << char
+						if not temp.empty?
+							tokens << temp
+						end
+						temp = ""
+					else
+						temp << char
+					end
+				else
+					if char == "(" || char == ")"
+						if not temp.empty?
+							tokens << temp
+							temp = ""
+						end
+						tokens << char
+						next
+					elsif char == "\""
+						found_string = true
+						temp << char
+					elsif char == " "
+						if not temp.empty?
+							tokens << temp
+						end
+						temp = ""
+					elsif char == "\t" || char == "\n"
+						if not temp.empty?						
+							tokens << temp
+						end
+						temp = ""
+					else
+						temp << char
+					end
+				end
+			end
+			return tokens
 		end
 
 		# reads an expression from an array of tokens (created
@@ -18,6 +59,7 @@ module Theta
 			if tokens.length == 0
 				raise SyntaxError, "unexpected EOF while reading"
 			end
+			tokens.delete_if { |item| item.strip == "" || item == []}
 			token = tokens.shift
 			if "(" == token
 				l = []
@@ -28,13 +70,8 @@ module Theta
 				return l
 			elsif ")" == token
 				raise SyntaxError, "unexpected )"
-			elsif "\"" == token
-				string = ""
-				until tokens[0] == "\""
-					string += " " + tokens.shift
-				end
-				tokens.shift
-				return string.gsub(/\n/, "")
+			elsif token.start_with?("\"")
+				return token.gsub("\"", "")
 			else
 				return atom(token)
 			end
@@ -43,6 +80,7 @@ module Theta
 		# returns appropriate numeric object if a number, 
 		# otherwise returns a symbol
 		def atom(token)
+			token.gsub!(/\n\t/, "")
 			begin
 				return Integer(token)
 			rescue ArgumentError

data/theta.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{theta}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris O'Neal"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-03-29}
   s.description = %q{Theta was created as a learning project based off of lis.py and flea}
   s.email = %q{ctoneal@gmail.com}
   s.executables = ["theta", "theta"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/theta/interpreter.rb",
     "lib/theta/library/add.scm",
     "lib/theta/library/divide.scm",
+    "lib/theta/library/lambda.scm",
     "lib/theta/library/multiply.scm",
     "lib/theta/library/subtract.scm",
     "lib/theta/parser.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theta
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-28 00:00:00.000000000 -05:00
+date: 2011-03-29 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &7590828 !ruby/object:Gem::Requirement
+  requirement: &9486048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7590828
+  version_requirements: *9486048
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7589724 !ruby/object:Gem::Requirement
+  requirement: &9485316 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7589724
+  version_requirements: *9485316
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &7588884 !ruby/object:Gem::Requirement
+  requirement: &9484296 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *7588884
+  version_requirements: *9484296
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &7588152 !ruby/object:Gem::Requirement
+  requirement: &9479136 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7588152
+  version_requirements: *9479136
 description: Theta was created as a learning project based off of lis.py and flea
 email: ctoneal@gmail.com
 executables:
@@ -79,6 +79,7 @@ files:
 - lib/theta/interpreter.rb
 - lib/theta/library/add.scm
 - lib/theta/library/divide.scm
+- lib/theta/library/lambda.scm
 - lib/theta/library/multiply.scm
 - lib/theta/library/subtract.scm
 - lib/theta/parser.rb
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -350340689
+      hash: 1029420371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: