diff options
| author | Paul Buetow <paul@buetow.org> | 2008-08-24 19:47:50 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-08-24 19:47:50 +0000 |
| commit | cf9029ee902eda028f3efcb77e8c2aed25205b94 (patch) | |
| tree | 433e9fed4d686d86374d087c27aa89f66c8c4796 | |
| parent | 7f3055c1f4429a81de3715d5d4173353382e2de2 (diff) | |
foo bar baz
| -rw-r--r-- | docs/help.txt | 2 | ||||
| -rw-r--r-- | docs/stats.txt | 2 | ||||
| -rw-r--r-- | docs/version.txt | 2 | ||||
| -rw-r--r-- | examples/conditionals.fy | 24 | ||||
| -rw-r--r-- | src/build.h | 2 | ||||
| -rw-r--r-- | src/core/function.c | 14 |
6 files changed, 21 insertions, 25 deletions
diff --git a/docs/help.txt b/docs/help.txt index d96ea80..b99b60f 100644 --- a/docs/help.txt +++ b/docs/help.txt @@ -1,4 +1,4 @@ -Fype v0.0-devel Build 9116 +Fype v0.0-devel Build 9136 Copyright by Paul C. Buetow (2005 - 2008) <fype@dev.buetow.org> -e Executes given code string (see synopses) -h Prints this help diff --git a/docs/stats.txt b/docs/stats.txt index 92e699d..50cfed4 100644 --- a/docs/stats.txt +++ b/docs/stats.txt @@ -1,4 +1,4 @@ ===> Num of C source files : 42 -===> Num of C source lines : 7256 +===> Num of C source lines : 7252 ===> Num of Fype source examples : 13 ===> Num of Fype source lines : 320 diff --git a/docs/version.txt b/docs/version.txt index 37e045d..cb62366 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -Fype v0.0-devel Build 9116 +Fype v0.0-devel Build 9136 diff --git a/examples/conditionals.fy b/examples/conditionals.fy index 38bd46d..1260ae2 100644 --- a/examples/conditionals.fy +++ b/examples/conditionals.fy @@ -21,21 +21,21 @@ assert 0 == (put 0 == 1); assert 1 == (say 0 == 0); # "0110\n" -assert 0 == (put 1 =! 1); -assert 1 == (put 1 =! 0); -assert 1 == (put 0 =! 1); -assert 0 == (say 0 =! 0); +assert 0 == (put 1 != 1); +assert 1 == (put 1 != 0); +assert 1 == (put 0 != 1); +assert 0 == (say 0 != 0); # "1011\n" -assert 1 == (put 1 =< 1); -assert 0 == (put 1 =< 0); -assert 1 == (put 0 =< 1); -assert 1 == (say 0 =< 0); +assert 1 == (put 1 <= 1); +assert 0 == (put 1 <= 0); +assert 1 == (put 0 <= 1); +assert 1 == (say 0 <= 0); ## "1101\n" -assert 1 == (put 1 => 1); -assert 1 == (put 1 => 0); -assert 0 == (put 0 => 1); -assert 1 == (say 0 => 0); +assert 1 == (put 1 >= 1); +assert 1 == (put 1 >= 0); +assert 0 == (put 0 >= 1); +assert 1 == (say 0 >= 0); diff --git a/src/build.h b/src/build.h index b5cb296..8be647b 100644 --- a/src/build.h +++ b/src/build.h @@ -35,7 +35,7 @@ #ifndef BUILD_H #define BUILD_H -#define BUILDNR 9120 +#define BUILDNR 9136 #define OS_FREEBSD #endif diff --git a/src/core/function.c b/src/core/function.c index 06e89bb..39971a1 100644 --- a/src/core/function.c +++ b/src/core/function.c @@ -74,22 +74,16 @@ _process(Interpret *p_interpret, Token *p_token_store, Token *p_token_op, #endif /* DEBUG_FUNCTION_PROCESS */ if (p_token_op2 != NULL) { -#ifdef DEBUG_FUNCTION_PROCESS - printf("===> %s %s %s %s\n", - tt_get_name(tt_highest), - tt_get_name(tt_op), - tt_get_name(tt_op2), - tt_get_name(tt_highest)); -#endif /* DEBUG_FUNCTION_PROCESS */ - switch (tt_op) { case TT_NOT: switch (tt_op2) { case TT_ASSIGN: tt_op = TT_NEQ; + break; default: break; } + break; case TT_ASSIGN: switch (tt_op2) { case TT_ASSIGN: @@ -98,6 +92,7 @@ _process(Interpret *p_interpret, Token *p_token_store, Token *p_token_op, default: break; } + break; case TT_LT: switch (tt_op2) { case TT_ASSIGN: @@ -106,6 +101,7 @@ _process(Interpret *p_interpret, Token *p_token_store, Token *p_token_op, default: break; } + break; case TT_GT: switch (tt_op2) { case TT_ASSIGN: @@ -114,6 +110,7 @@ _process(Interpret *p_interpret, Token *p_token_store, Token *p_token_op, default: break; } + break; default: break; } @@ -287,7 +284,6 @@ _process(Interpret *p_interpret, Token *p_token_store, Token *p_token_op, } break; case TT_LE: - printf("DFDF\n"); switch (tt_highest) { case TT_INTEGER: token_set_ival(p_token_store, |
