simplify

minlisp.rb

@@ -15,9 +15,7 @@ end
 
 def tokenize(program)
   # Convert scripts to token lists
-  replacements = { '(' => ' ( ', ')' => ' ) ' }
+  program.gsub('(', ' ( ').gsub(')', ' ) ').split
-  program.gsub(Regexp.union(replacements.keys), replacements)
-         .split(' ')
 end
 
 def make_list(tokens)
@@ -31,8 +29,7 @@ def read_tokens(tokens)
   # read expressions from token
   raise SyntaxError, 'Unexpected EOF' if tokens.empty?
 
-  token = tokens.shift
+  case token = tokens.shift
-  case token
   when '('
     make_list tokens
   when ')'
@@ -44,18 +41,17 @@ end
 
 def atom(token)
   # Analyse numbers and symbols
-  is_integer = ->(atom) { atom.match?(/^-?\d+$/) }
+  case token
-  is_float   = ->(atom) { atom.match?(/^(-?\d+)(\.\d+)?$/) }
+  when /\d/
-  return Integer token if is_integer.call token
+    (token.to_f % 1).positive? ? token.to_f : token.to_i
-  return Float   token if is_float.call   token
+  else
-
     token.to_sym
   end
+end
 
 ##### Environments
 
-def generate_env
+$global_env = {
-  lisp_env = {
   '+': ->(args) { args.sum }, # args.inject(0, :+)
   '-': ->(*args) { eval args.join('-') },
   '*': ->(*args) { eval args.join('*') },
@@ -74,11 +70,8 @@ def generate_env
   'print': ->(arg) { p arg },
   'begin': ->(*_args) { true }
 }
-end
 
 ##### Lisp Eval
-
-$global_env = generate_env
 def lisp_eval(elem, env = $global_env)
   if elem.instance_of? Symbol
     env[elem]
@@ -103,18 +96,17 @@ def lisp_eval(elem, env = $global_env)
 end
 
 ##### REPL
-
 def repl(prompt = 'minlisp ƛ>> ')
   loop do
     print prompt
     val = lisp_eval(parse(gets.chomp))
 
-    print_value val unless val.nil?
+    print_value val unless val.nil? || val.instance_of?(Proc)
   end
 end
 
 def print_value(value)
-  puts ";Value: #{value.to_s}"
+  puts ";Value: #{value}"
 end
 
-repl()
+repl