Better tests for Calc.

rsm-lisper · May 22, 2024 · 8158578 · 8158578
1 parent 0636a1b
commit 8158578
Show file tree

Hide file tree

Showing 84 changed files with 78 additions and 37 deletions.
diff --git a/.../4_03.calc__modulo_negative/get_ungetch.c → ...ucture/4_03.calc__modulo_negative/getch.c b/.../4_03.calc__modulo_negative/get_ungetch.c → ...ucture/4_03.calc__modulo_negative/getch.c
@@ -2,12 +2,12 @@
 
 # define BUFSIZE 128
 
-char buf[BUFSIZE];   /* buffer fir ungetch */
+char buf[BUFSIZE];   /* buffer for ungetch */
 int bufp = 0;        /* next free position in buf */
 
 
 /* getch: get a (possibly pushed-back) character */
-int getch(void)
+int getch (void)
 {
   return (bufp > 0) ? buf[--bufp] : getchar();
 }

diff --git a/.../4_03.calc__modulo_negative/get_ungetch.h → ...ucture/4_03.calc__modulo_negative/getch.h b/.../4_03.calc__modulo_negative/get_ungetch.h → ...ucture/4_03.calc__modulo_negative/getch.h
@@ -1,8 +1,9 @@
-# ifndef GET_UNGETCH_H
-# define GET_UNGETCH_H
+# ifndef GETCH_H
+# define GETCH_H
 
 /* getch: get a (possibly pushed-back) character */
 int getch (void);
+
 /* ungetch: push character back on input */
 void ungetch (int c);
 

diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/getop.c b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/getop.c
@@ -2,7 +2,7 @@
 # include <ctype.h>
 
 # include "getop.h"
-# include "get_ungetch.h"
+# include "getch.h"
 
 
 /* getop: get next character or numeric operand */

diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/main.c b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/main.c
@@ -1,7 +1,7 @@
 # include <stdio.h>
 # include <stdlib.h> /* for atof */
 
-# include "pop_push.h"
+# include "stack.h"
 # include "getop.h"
 
 # define MAXOP 128    /* max size of operand or operator */

diff --git a/...ure/4_03.calc__modulo_negative/pop_push.c → ...ucture/4_03.calc__modulo_negative/stack.c b/...ure/4_03.calc__modulo_negative/pop_push.c → ...ucture/4_03.calc__modulo_negative/stack.c
diff --git a/...ure/4_03.calc__modulo_negative/pop_push.h → ...ucture/4_03.calc__modulo_negative/stack.h b/...ure/4_03.calc__modulo_negative/pop_push.h → ...ucture/4_03.calc__modulo_negative/stack.h
@@ -1,8 +1,9 @@
-# ifndef POP_PUSH_H
-# define POP_PUSH_H
+# ifndef STACK_H
+# define STACK_H
 
 /* push: push f onto stack */
 void push (double f);
+
 /* pop: pop and return top value from stack */
 double pop (void);
 

diff --git a/...ter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/00_error_stack_empty.tin b/...ter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/00_error_stack_empty.tin
@@ -0,0 +1 @@
+
diff --git a/...ture/4_04.calc__stack_cmds/tests/t12.tout → ..._negative/tests/00_error_stack_empty.tout b/...ture/4_04.calc__stack_cmds/tests/t12.tout → ..._negative/tests/00_error_stack_empty.tout
diff --git a/...4.functions_progr_structure/4_03.calc__modulo_negative/tests/01_error_unknown_command.tin b/...4.functions_progr_structure/4_03.calc__modulo_negative/tests/01_error_unknown_command.tin
@@ -0,0 +1 @@
+1 ( )
diff --git a/....functions_progr_structure/4_03.calc__modulo_negative/tests/01_error_unknown_command.tout b/....functions_progr_structure/4_03.calc__modulo_negative/tests/01_error_unknown_command.tout
@@ -0,0 +1,3 @@
+error: unknown command (
+error: unknown command )
+	1
diff --git a/...er_4.functions_progr_structure/4_03.calc__modulo_negative/tests/02_error_zero_divisor.tin b/...er_4.functions_progr_structure/4_03.calc__modulo_negative/tests/02_error_zero_divisor.tin
@@ -0,0 +1 @@
+5 0 /
diff --git a/...r_4.functions_progr_structure/4_03.calc__modulo_negative/tests/02_error_zero_divisor.tout b/...r_4.functions_progr_structure/4_03.calc__modulo_negative/tests/02_error_zero_divisor.tout
@@ -0,0 +1,2 @@
+error: zero divisor
+	5
diff --git a/...er_4.functions_progr_structure/4_03.calc__modulo_negative/tests/03_error_zero_modulus.tin b/...er_4.functions_progr_structure/4_03.calc__modulo_negative/tests/03_error_zero_modulus.tin
@@ -0,0 +1 @@
+5 0 %
diff --git a/...r_4.functions_progr_structure/4_03.calc__modulo_negative/tests/03_error_zero_modulus.tout b/...r_4.functions_progr_structure/4_03.calc__modulo_negative/tests/03_error_zero_modulus.tout
@@ -0,0 +1,2 @@
+error: zero modulus
+	5
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/10_add.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/10_add.tin
@@ -0,0 +1 @@
+1024 1024 +
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/10_add.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/10_add.tout
@@ -0,0 +1 @@
+	2048
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/11_sub.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/11_sub.tin
@@ -0,0 +1 @@
+1024 2048 -
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/11_sub.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/11_sub.tout
@@ -0,0 +1 @@
+	-1024
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/12_sub_negative.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/12_sub_negative.tin
@@ -0,0 +1 @@
+-10 -55 -
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/12_sub_negative.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/12_sub_negative.tout
@@ -0,0 +1 @@
+	45
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/13_multi.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/13_multi.tin
@@ -0,0 +1 @@
+-2 100 -5 * *
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/13_multi.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/13_multi.tout
@@ -0,0 +1 @@
+	1000
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/14_div.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/14_div.tin
@@ -0,0 +1 @@
+125 -5 / 5 / -0.2 /
diff --git a/.../4_03.calc__modulo_negative/tests/t2.tout → ...3.calc__modulo_negative/tests/14_div.tout b/.../4_03.calc__modulo_negative/tests/t2.tout → ...3.calc__modulo_negative/tests/14_div.tout
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/15_mod.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/15_mod.tin
@@ -0,0 +1 @@
+20 100 21 % %
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/15_mod.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/15_mod.tout
@@ -0,0 +1 @@
+	4
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/16_many.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/16_many.tin
@@ -0,0 +1 @@
+  -1   1 - 100 * 5 / 25 /    1 +
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/16_many.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/16_many.tout
@@ -0,0 +1 @@
+	-0.6
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t0.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t0.tin
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t0.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t0.tout
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t1.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t1.tin
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t1.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t1.tout
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t2.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t2.tin
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t3.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t3.tin
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t3.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t3.tout
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t4.tin b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t4.tin
diff --git a/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t4.tout b/chapter_4.functions_progr_structure/4_03.calc__modulo_negative/tests/t4.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/getch.c b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/getch.c
@@ -2,12 +2,12 @@
 
 # define BUFSIZE 128
 
-char buf[BUFSIZE];   /* buffer fir ungetch */
+char buf[BUFSIZE];   /* buffer for ungetch */
 int bufp = 0;        /* next free position in buf */
 
 
 /* getch: get a (possibly pushed-back) character */
-int getch(void)
+int getch (void)
 {
   return (bufp > 0) ? buf[--bufp] : getchar();
 }

diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/00_error_stack_empty.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/00_error_stack_empty.tin
@@ -0,0 +1 @@
+
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/00_error_stack_empty.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/00_error_stack_empty.tout
@@ -0,0 +1,2 @@
+error: stack empty
+	0
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/01_error_unknown_command.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/01_error_unknown_command.tin
@@ -0,0 +1 @@
+1 ( )
diff --git a/...ter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/01_error_unknown_command.tout b/...ter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/01_error_unknown_command.tout
@@ -0,0 +1,3 @@
+error: unknown command (
+error: unknown command )
+	1
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/02_error_zero_divisor.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/02_error_zero_divisor.tin
@@ -0,0 +1 @@
+5 0 /
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/02_error_zero_divisor.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/02_error_zero_divisor.tout
@@ -0,0 +1,2 @@
+error: zero divisor
+	5
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/03_error_zero_modulus.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/03_error_zero_modulus.tin
@@ -0,0 +1 @@
+5 0 %
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/03_error_zero_modulus.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/03_error_zero_modulus.tout
@@ -0,0 +1,2 @@
+error: zero modulus
+	5
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/04_error_stack_empty.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/04_error_stack_empty.tin
@@ -0,0 +1 @@
+ : 
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/04_error_stack_empty.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/04_error_stack_empty.tout
@@ -0,0 +1,4 @@
+error: stack empty
+	0
+error: stack empty
+	0
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/10_add.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/10_add.tin
@@ -0,0 +1 @@
+1024 1024 +
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/10_add.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/10_add.tout
@@ -0,0 +1 @@
+	2048
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/11_sub.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/11_sub.tin
@@ -0,0 +1 @@
+1024 2048 -
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/11_sub.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/11_sub.tout
@@ -0,0 +1 @@
+	-1024
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/12_sub_negative.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/12_sub_negative.tin
@@ -0,0 +1 @@
+-10 -55 -
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/12_sub_negative.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/12_sub_negative.tout
@@ -0,0 +1 @@
+	45
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/13_multi.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/13_multi.tin
@@ -0,0 +1 @@
+-2 100 -5 * *
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/13_multi.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/13_multi.tout
@@ -0,0 +1 @@
+	1000
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/14_div.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/14_div.tin
@@ -0,0 +1 @@
+125 -5 / 5 / -0.2 /
diff --git a/...ture/4_04.calc__stack_cmds/tests/t02.tout → ...e/4_04.calc__stack_cmds/tests/14_div.tout b/...ture/4_04.calc__stack_cmds/tests/t02.tout → ...e/4_04.calc__stack_cmds/tests/14_div.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/15_mod.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/15_mod.tin
@@ -0,0 +1 @@
+20 100 21 % %
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/15_mod.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/15_mod.tout
@@ -0,0 +1 @@
+	4
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/16_many.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/16_many.tin
@@ -0,0 +1 @@
+  -1   1 - 100 * 5 / 25 /    1 +
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/16_many.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/16_many.tout
@@ -0,0 +1 @@
+	-0.6
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/20_stack_peek.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/20_stack_peek.tin
@@ -0,0 +1 @@
+1.01 : 999
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/20_stack_peek.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/20_stack_peek.tout
@@ -0,0 +1,2 @@
+	1.01
+	999
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/21_stack_swap.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/21_stack_swap.tin
@@ -0,0 +1 @@
+1 2 3 |
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/21_stack_swap.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/21_stack_swap.tout
@@ -0,0 +1 @@
+	2
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/22_stack_clear.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/22_stack_clear.tin
@@ -0,0 +1 @@
+1 22 300 !
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/22_stack_clear.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/22_stack_clear.tout
@@ -0,0 +1,2 @@
+error: stack empty
+	0
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t00.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t00.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t00.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t00.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t01.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t01.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t01.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t01.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t02.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t02.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t03.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t03.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t03.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t03.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t04.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t04.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t04.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t04.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t10.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t10.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t10.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t10.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t11.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t11.tin
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t11.tout b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t11.tout
diff --git a/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t12.tin b/chapter_4.functions_progr_structure/4_04.calc__stack_cmds/tests/t12.tin
diff --git a/chapter_4.functions_progr_structure/4_05.calc__math/getch.c b/chapter_4.functions_progr_structure/4_05.calc__math/getch.c
@@ -2,12 +2,12 @@
 
 # define BUFSIZE 128
 
-char buf[BUFSIZE];   /* buffer fir ungetch */
+char buf[BUFSIZE];   /* buffer for ungetch */
 int bufp = 0;        /* next free position in buf */
 
 
 /* getch: get a (possibly pushed-back) character */
-int getch(void)
+int getch (void)
 {
   return (bufp > 0) ? buf[--bufp] : getchar();
 }

diff --git a/chapter_4.functions_progr_structure/4_06.calc__variables/getch.c b/chapter_4.functions_progr_structure/4_06.calc__variables/getch.c
@@ -2,7 +2,7 @@
 
 # define BUFSIZE 128
 
-char buf[BUFSIZE];   /* buffer fir ungetch */
+char buf[BUFSIZE];   /* buffer for ungetch */
 int bufp = 0;        /* next free position in buf */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		error: unknown command (
		error: unknown command )
		1