theta 0.1.2 → 0.1.3

data/README.rdoc

@@ -21,4 +21,19 @@ After installation, simply type theta to get to the interactive interpreter prom
 	
 To exit, simply type 'exit' at the prompt.
 
-It's a little low on features currently, but I'll be adding more eventually!
+Or, you can use the -f command line parameter to evaluate a file.
+
+	% theta -f test.scm
+	
+Alternately, you can use the -c parameter and pass in code directly.
+
+	% theta -c "(+ 3 2)"
+	
+And finally, you can use Theta inside your own Ruby programs, if that sounds like something you'd do.
+
+	require 'rubygems'
+	require 'theta'
+	
+	t = Theta::Interpreter.new
+	t.run "(define n 15)"
+	puts t.run "(+ 10 n)"	

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/theta

@@ -1,12 +1,40 @@
 #!/usr/bin/env ruby
-
+require 'optparse'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "theta.rb"))
 
+options = { :mode => :repl }
+op = OptionParser.new do |x|
+	x.banner = "theta <options>"
+	x.separator "\nUsing no options will start the interactive interpreter."
+	x.on("-f <file_path>", String, "Open a given file") do |f|
+		options[:mode] = :file
+		options[:file] = f
+	end
+	x.on("-c <code>", String, "Perform the given code") do |c|
+		options[:mode] = :code
+		options[:code] = c
+	end
+	x.on("-h", "Show this message") do
+		puts op
+		exit
+	end
+end
+begin
+	op.parse!(ARGV)
+rescue
+	puts "Could not parse command line arguments."
+	exit
+end
+
 theta = Theta::Base.new
-# if a file was passed in, run it
-# otherwise, enter the repl
-if ARGV.length > 0
-	theta.run(ARGV[1])
-else
+case options[:mode]
+when :repl
+	puts "Starting interactive interpreter..."
 	theta.repl
+when :file
+	puts "Running file..."
+	theta.load_file(options[:file])
+when :code
+	puts "Interpreting code..."
+	theta.run(options[:code])
 end

data/lib/theta/interpreter.rb

@@ -1,3 +1,6 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "environment.rb"))
+require File.expand_path(File.join(File.dirname(__FILE__), "parser.rb"))
+
 module Theta
 	# interpret scheme code
 	class Interpreter

data/lib/theta.rb

@@ -1,6 +1,4 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "theta", "interpreter.rb"))
-require File.expand_path(File.join(File.dirname(__FILE__), "theta", "environment.rb"))
-require File.expand_path(File.join(File.dirname(__FILE__), "theta", "parser.rb"))
 
 module Theta
 	# runs the interpreter
@@ -10,30 +8,48 @@ module Theta
 			@interpreter = Interpreter.new
 		end
 		
-		# run a preexisting program
-		def run(fileName)
-			program = File.open(fileName) { |f| f.read }
+		# load and run the given file
+		def load_file(file_path)
+			program = File.open(file_path) { |f| f.read }
+			run program
+		end
+		
+		# run given code
+		def run(program)
 			puts @interpreter.run(program)
 		end
 		
 		# start an interactive interpreter
 		def repl
+			puts "For interpreter commands, type 'help'"
 			while true
 				print "theta> "
-				input = ""
-				input << gets.strip
-				if input == "exit"
+				input = gets.chomp
+				case input
+				#when "clear"
+				#	puts "Resetting environment..."
+				#	@interpreter = Interpreter.new
+				when "exit", 24.chr
 					puts "Exiting..."
 					return
-				end
-				if input.empty?
-					next
-				end
-				value = @interpreter.run(input)
-				unless value.nil?
-					puts @interpreter.make_readable(value)
+				when "help"
+					repl_help
+				else
+					begin
+						value = @interpreter.run(input)
+					rescue SyntaxError
+					end
+					unless value.nil?
+						puts @interpreter.make_readable(value)
+					end
 				end
 			end
 		end
+		
+		def repl_help
+			#puts "'clear' resets the environment"
+			puts "'exit' or Ctrl-X will exit the interpreter"
+			puts "'help' will display this message"
+		end
 	end
 end

data/theta.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{theta}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-29}
+  s.date = %q{2011-06-10}
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theta
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-29 00:00:00.000000000 -05:00
+date: 2011-06-10 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &9485220 !ruby/object:Gem::Requirement
+  requirement: &7339260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9485220
+  version_requirements: *7339260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9484644 !ruby/object:Gem::Requirement
+  requirement: &7338048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9484644
+  version_requirements: *7338048
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9483744 !ruby/object:Gem::Requirement
+  requirement: &7336620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *9483744
+  version_requirements: *7336620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &9483072 !ruby/object:Gem::Requirement
+  requirement: &7334976 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9483072
+  version_requirements: *7334976
 description: Theta was created as a learning project based off of lis.py and flea
 email: ctoneal@gmail.com
 executables:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -933902079
+      hash: 260486451
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: