Fix add with two carries

Author: shinh

sedlisp.sed

@@ -19,12 +19,12 @@ s/\([^ ()]\)(/\1 (/g
 
 s/  */ /g
 
-## i *** loop ***
-## p
-## x
-## i *** stack ***
-## p
-## x
+# i *** loop ***
+# p
+# x
+# i *** stack ***
+# p
+# x
 
 #s/( *)/nil/g
 
@@ -322,9 +322,9 @@ s/\n.*//
   s/\(.*\) \([0-9]*\)\(\n\(-\)\)\?/\1@ \2@ 9876543210 9876543210\n\4/
 
 :add_loop
-  s/\(.\)@\(.*\)\(.\)@\(.\)\? \(.*\1\(.*\)\) .*\3\(.*\)\n/@\2; \4\6\7\5 \5 \5\n/
+  s/\(.\)@\(.*\)\(.\)@\(.\)\? \(.*\1\(.*\)\) .*\(\3.*\)\n/@\2; \4\6\7\5 \5 \5\n/
 
-  s/; .\{9\}\(.\)\([0-9]\{9\}\([0-9]\)\)\?[0-9]* \(.*\)\n\(.*\)/@\3 \4\n\1\5/
+  s/; .\{10\}\(.\)\([0-9]\{9\}\([0-9]\)\)\?[0-9]* \(.*\)\n\(.*\)/@\3 \4\n\1\5/
 
   /^@ @/{
     s/@ @. .*\n/\n1/

test.l

@@ -3,6 +3,7 @@
 (+  98 2 )
 (+  38 2 )
 (+ -19 -99)
+(+ 99 99)
 
 (- 3 -17)
 (- -3 29)
@@ -49,7 +50,7 @@
 
 (+(- 9 2) 1)
 
-(- (- 9 2) (- 3 7))
+(- (- 9 2) (- 3 6))
 
 (+ (+ (+ 1 2) 3) 4)
 (+ 1 (+ 2 (+ 3 4)))
@@ -117,6 +118,7 @@
 (cons 42 (quote ()))
 (cons 1 (quote (2)))
 (cons (quote (1 2)) (quote (3 ((5 6)) 4)))
+(cons 2 (cons 3 ()))
 
 (atom ())
 (atom nil)

test.rb

@@ -13,12 +13,18 @@
 end
 
 ref_lisp = ARGV[0] || 'purelisp.rb'
-test_lisp = ARGV[1] || 'sedlisp.sed'
+test_lisp = ARGV[1]
+test_lisp ||= File.exist?('sedlisp.sed') ? 'sedlisp.sed' : 'beflisp.bef'
 
 COMMANDS = {
   'purelisp.rb' => ['ruby', 'purelisp.rb'],
   'rblisp.rb' => ['ruby', 'rblisp.rb'],
   'sedlisp.sed' => ['sed', '-f', 'sedlisp.sed'],
+  'lisp.bef' => ['./befunge', 'lisp.bef'],
+  'beflisp.bef' => ['./befunge', 'beflisp.bef'],
+  'lisp' => ['./lisp'],
+  'makelisp.mk' => ['make', '-f', 'makelisp.mk'],
+  'makelisp2.mk' => ['make', '-f', 'makelisp2.mk'],
 }
 
 def getResult(cmd, line)
@@ -64,9 +70,9 @@ def getResult(cmd, line)
   end
 
   expected = getResult(COMMANDS[ref_lisp], $eval_test ? line : orig)
-  expected = expected.lines[-1].chomp
+  expected = expected.lines.to_a[-1].to_s.chomp
   output = getResult(COMMANDS[test_lisp], line)
-  actual = output.lines[-1].chomp
+  actual = output.lines.to_a[-1].to_s.chomp
 
   if expected == actual
     puts "#{orig}: OK (#{expected})"