diff options
50 files changed, 106 insertions, 125 deletions
@@ -1,6 +1,6 @@ -Fype (http://www.fype.org) is ... -... Copyright (c) 2005 2006 2007 2008 by Paul Buetow (http://www.pblabs.net) -All rights reserved. +Fype (http://fype.buetow.org) is ... +... Copyright (c) 2005 2006 2007 2008 by Paul C. Buetow +(http://www.pb-labs.com) All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1,2 +1,4 @@ Undocumented new features: undef keyword + No more segfault: fype -e '1' + Spaces are not needed any more @@ -1,11 +1,10 @@ Todo's (not in any specific order) -Segfault: fype -e '1' +Scanner: separate between token (e.g. allow 1+2) Arrays Closures Function arguments and return values Interactive shell Labels -Scanner: separate between token (e.g. allow 1+2) String operators/functions loop, next, break, do diff --git a/docs/header.txt b/docs/header.txt index 0b508d9..18bc48e 100644 --- a/docs/header.txt +++ b/docs/header.txt @@ -4,7 +4,7 @@ A simple interpreter WWW : http://fype.buetow.org E-Mail : fype@dev.buetow.org -Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) +Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) All rights reserved. Redistribution and use in source and binary forms, with or without modi- diff --git a/docs/help.txt b/docs/help.txt index e25397a..8c52ff4 100644 --- a/docs/help.txt +++ b/docs/help.txt @@ -1,4 +1,4 @@ -Fype v0.0-devel Build 8868 +Fype v0.0-devel Build 8978 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 3823e6c..940e9f3 100644 --- a/docs/stats.txt +++ b/docs/stats.txt @@ -1,4 +1,4 @@ ===> Num of C source files : 42 -===> Num of C source lines : 7215 +===> Num of C source lines : 7202 ===> Num of Fype source examples : 13 ===> Num of Fype source lines : 320 diff --git a/docs/version.txt b/docs/version.txt index a7bdd50..3179b53 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -Fype v0.0-devel Build 8868 +Fype v0.0-devel Build 8978 @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/build.h b/src/build.h index c0feb55..a770852 100644 --- a/src/build.h +++ b/src/build.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -35,7 +35,7 @@ #ifndef BUILD_H #define BUILD_H -#define BUILDNR 8870 +#define BUILDNR 8992 #define OS_FREEBSD #endif diff --git a/src/core/convert.c b/src/core/convert.c index bddbf1e..ff0fcb2 100644 --- a/src/core/convert.c +++ b/src/core/convert.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/convert.h b/src/core/convert.h index fc7f3bd..632283e 100644 --- a/src/core/convert.h +++ b/src/core/convert.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/function.c b/src/core/function.c index 134024b..4225309 100644 --- a/src/core/function.c +++ b/src/core/function.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/function.h b/src/core/function.h index 024b05a..e7cfe48 100644 --- a/src/core/function.h +++ b/src/core/function.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/garbage.c b/src/core/garbage.c index ec01dc6..3d39d71 100644 --- a/src/core/garbage.c +++ b/src/core/garbage.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/garbage.h b/src/core/garbage.h index 522bdd8..d7f6609 100644 --- a/src/core/garbage.h +++ b/src/core/garbage.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/interpret.c b/src/core/interpret.c index 4eb26b1..340b80a 100644 --- a/src/core/interpret.c +++ b/src/core/interpret.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/interpret.h b/src/core/interpret.h index 5f9e6d2..743a24a 100644 --- a/src/core/interpret.h +++ b/src/core/interpret.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/scanner.c b/src/core/scanner.c index 7159881..a202bc3 100644 --- a/src/core/scanner.c +++ b/src/core/scanner.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -37,45 +37,10 @@ #include <ctype.h> #include <string.h> -const char const *KEYWORDS[] = { - "if", - "else", - "elsif", - "while", - "ret", - "const", -}; - -const char const *OPERATORS[] = { - "!", - "!=", - "(", - ")", - "*", - "+", - "++", - ",", - "-", - "--", - ".", - "/", - "\\", - ":", - "==", - ";", - "<<", - "<", - "<=", - "=", - ">=", - ">>", - ">", - "{", - "}", -}; - -const char TOKENENDS[] = "{}();:,."; -int CODESTRING_INDEX = 0; +const char const *_TOKENENDS2[] = { "==", "!=", "<=", ">=", }; +const char _TOKENENDS[] = "})+-*/={(<>;:,.!"; +#define _ADD_SEMICOLON_INDEX 2 +int _CODESTR_INDEX = 0; Scanner* scanner_new(List *p_list_token, Tupel *p_tupel_argv) { @@ -105,9 +70,8 @@ scanner_new(List *p_list_token, Tupel *p_tupel_argv) { p_scanner->i_current_line_nr = 1; p_scanner->i_current_pos_nr = 0; - p_scanner->i_num_keywords = sizeof(KEYWORDS) / sizeof(char const *); - p_scanner->i_num_operators = sizeof(OPERATORS) / sizeof(char const *); - p_scanner->i_num_tokenends = strlen(TOKENENDS); + p_scanner->i_num_tokenends2 = sizeof(_TOKENENDS2) / sizeof(char const *); + p_scanner->i_num_tokenends = strlen(_TOKENENDS); return p_scanner; } @@ -120,6 +84,15 @@ scanner_delete(Scanner *p_scanner) { } void +_add_semicolon_to_list(Scanner *p_scanner) { + int i_token_len = 1; + char *c_token = calloc(2, sizeof(char*)); + c_token[0] = ';'; + c_token[1] = '\0'; + scanner_add_token(p_scanner, &c_token, &i_token_len, TT_SEMICOLON); +} + +void scanner_post_task(Scanner *p_scanner) { List *p_list_token = scanner_get_list_token(p_scanner); ListIterator *p_iter = listiterator_new(p_list_token); @@ -157,7 +130,7 @@ scanner_post_task(Scanner *p_scanner) { pt_last[0] = pt_last[1] = NULL; tt_last[0] = tt_last[1] = TT_NONE; - } + } } tt_last[0] = tt_last[1]; @@ -175,7 +148,7 @@ _scanner_has_next_char(Scanner *p_scanner) { if (p_scanner->fp) return !feof(p_scanner->fp); - return p_scanner->c_codestring[CODESTRING_INDEX] != 0; + return p_scanner->c_codestring[_CODESTR_INDEX] != 0; } char @@ -183,7 +156,7 @@ _scanner_get_next_char(Scanner *p_scanner) { if (p_scanner->fp) return fgetc(p_scanner->fp); - return (p_scanner->c_codestring[CODESTRING_INDEX++]); + return (p_scanner->c_codestring[_CODESTR_INDEX++]); } void @@ -196,7 +169,6 @@ scanner_run(Fype *p_fype) { c_token[0] = 0; while ( _scanner_has_next_char(p_scanner) ) { - //char c = fgetc(fp); char c = _scanner_get_next_char(p_scanner); ++p_scanner->i_current_pos_nr; @@ -238,8 +210,8 @@ scanner_run(Fype *p_fype) { } { int i_num_nl = 0; + _Bool flag = false; do { - // c = fgetc(fp); c = _scanner_get_next_char(p_scanner); if ( c == '\n' ) { ++i_num_nl; @@ -252,11 +224,13 @@ scanner_run(Fype *p_fype) { c_token[i_token_len] = 0; } else if (c == '"') { - if (i_token_len && c_token[i_token_len-1] == '\\') + if (i_token_len && c_token[i_token_len-1] == '\\') { c_token[i_token_len-1] = '"'; - else + } else { + flag = true; break; + } } else { ++i_token_len; @@ -265,13 +239,15 @@ scanner_run(Fype *p_fype) { c_token[i_token_len] = 0; } - //} while ( !feof(fp) ); } while ( _scanner_has_next_char(p_scanner) ); scanner_add_token(p_scanner, &c_token, &i_token_len, TT_STRING); if (i_num_nl) p_scanner->i_current_line_nr += i_num_nl; + + if (flag) + _add_semicolon_to_list(p_scanner); } break; @@ -301,10 +277,23 @@ scanner_run(Fype *p_fype) { scanner_add_token(p_scanner, &c_token, &i_token_len, tt_cur); } else { + for (int i = 0; i < p_scanner->i_num_tokenends2; ++i) { + if (_TOKENENDS2[i][0] == c) { + /* + TokenType tt_cur = scanner_get_tt_cur(c_token); + scanner_add_token(p_scanner, &c_token, &i_token_len, tt_cur); + if (i < _ADD_SEMICOLON_INDEX) + _add_semicolon_to_list(p_scanner); + break; + */ + } + } for (int i = 0; i < p_scanner->i_num_tokenends; ++i) { - if (TOKENENDS[i] == c) { + if (_TOKENENDS[i] == c) { TokenType tt_cur = scanner_get_tt_cur(c_token); - scanner_add_token(p_scanner, &c_token, &i_token_len, tt_cur); + scanner_add_token(p_scanner, &c_token, &i_token_len, tt_cur); + if (i < _ADD_SEMICOLON_INDEX) + _add_semicolon_to_list(p_scanner); break; } } @@ -323,6 +312,12 @@ scanner_run(Fype *p_fype) { scanner_add_token(p_scanner, &c_token, &i_token_len, tt_cur); } + /* Check if there is a ; missing */ + List *p_list_token = scanner_get_list_token(p_scanner); + Token *p_last_token = list_last(p_list_token); + if (token_get_tt(p_last_token) != TT_SEMICOLON) + _add_semicolon_to_list(p_scanner); + scanner_post_task(p_scanner); char *c_filename = scanner_get_filename(p_scanner); @@ -344,15 +339,6 @@ scanner_run(Fype *p_fype) { } p_fype->c_basename = c_basename; - - /* - c_token = calloc(2, sizeof(char*)); - c_token[0] = ';'; - c_token[1] = '\0'; - i_token_len = 1; - - scanner_add_token(p_scanner, &c_token, &i_token_len, TT_STRING); - */ } void diff --git a/src/core/scanner.h b/src/core/scanner.h index 9a83f9c..e760bc6 100644 --- a/src/core/scanner.h +++ b/src/core/scanner.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -50,8 +50,7 @@ typedef struct { int i_current_line_nr; int i_current_pos_nr; - int i_num_keywords; - int i_num_operators; + int i_num_tokenends2; int i_num_tokenends; char *c_filename; char *c_codestring; diff --git a/src/core/scope.c b/src/core/scope.c index e0b9fcd..f372a6a 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/scope.h b/src/core/scope.h index ac24edc..6e74e64 100644 --- a/src/core/scope.h +++ b/src/core/scope.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/symbol.c b/src/core/symbol.c index 71e9012..c6733f5 100644 --- a/src/core/symbol.c +++ b/src/core/symbol.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/symbol.h b/src/core/symbol.h index 9224d43..755c3f7 100644 --- a/src/core/symbol.h +++ b/src/core/symbol.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/token.c b/src/core/token.c index 593ae5e..58b334a 100644 --- a/src/core/token.c +++ b/src/core/token.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/core/token.h b/src/core/token.h index 2117fa2..bb57a64 100644 --- a/src/core/token.h +++ b/src/core/token.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/array.c b/src/data/array.c index 5afaf10..33afb39 100644 --- a/src/data/array.c +++ b/src/data/array.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/array.h b/src/data/array.h index bfca3c2..7d24dc0 100644 --- a/src/data/array.h +++ b/src/data/array.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/dat.c b/src/data/dat.c index 462faf5..e82db75 100644 --- a/src/data/dat.c +++ b/src/data/dat.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/dat.h b/src/data/dat.h index 426eaa0..58cc686 100644 --- a/src/data/dat.h +++ b/src/data/dat.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/hash.c b/src/data/hash.c index d2e3b20..3a5a686 100644 --- a/src/data/hash.c +++ b/src/data/hash.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/hash.h b/src/data/hash.h index 1c1db37..a783359 100644 --- a/src/data/hash.h +++ b/src/data/hash.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/list.c b/src/data/list.c index 3aca167..00e9b95 100644 --- a/src/data/list.c +++ b/src/data/list.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/list.h b/src/data/list.h index cd8bd1e..332b2a6 100644 --- a/src/data/list.h +++ b/src/data/list.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/map.c b/src/data/map.c index 605c053..0668b17 100644 --- a/src/data/map.c +++ b/src/data/map.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/map.h b/src/data/map.h index eee9183..eb4bdc6 100644 --- a/src/data/map.h +++ b/src/data/map.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/queue.c b/src/data/queue.c index ab02c6d..fa080a8 100644 --- a/src/data/queue.c +++ b/src/data/queue.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/queue.h b/src/data/queue.h index a9a4b5e..b5d8dfe 100644 --- a/src/data/queue.h +++ b/src/data/queue.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/stack.c b/src/data/stack.c index 7fb6402..610d139 100644 --- a/src/data/stack.c +++ b/src/data/stack.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/stack.h b/src/data/stack.h index 99571b0..41574b0 100644 --- a/src/data/stack.h +++ b/src/data/stack.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/tree.c b/src/data/tree.c index 36da485..425c9df 100644 --- a/src/data/tree.c +++ b/src/data/tree.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/tree.h b/src/data/tree.h index da37658..f97be52 100644 --- a/src/data/tree.h +++ b/src/data/tree.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/tupel.c b/src/data/tupel.c index c4fed76..0ff45dd 100644 --- a/src/data/tupel.c +++ b/src/data/tupel.c @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/tupel.h b/src/data/tupel.h index 81c1337..71e1f55 100644 --- a/src/data/tupel.h +++ b/src/data/tupel.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/data/types.h b/src/data/types.h index 2d5d6c3..5a396c4 100644 --- a/src/data/types.h +++ b/src/data/types.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/src/defines.h b/src/defines.h index e3fb3de..507d3b4 100644 --- a/src/defines.h +++ b/src/defines.h @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -74,13 +74,11 @@ exit(1); } #define DPRINTF(...) printf("DEBUG("); printf(__VA_ARGS__); printf(")\n"); -/* -#define DEBUG_TOKEN_REFCOUNT -#define DEBUG_FUNCTION_PROCESS -#define DEBUG_TRACK -#define DEBUG_BLOCK_GET -#define DEBUG_EXPRESSION_GET -*/ +//#define DEBUG_TOKEN_REFCOUNT +//#define DEBUG_FUNCTION_PROCESS +//#define DEBUG_TRACK +//#define DEBUG_BLOCK_GET +//#define DEBUG_EXPRESSION_GET #ifdef DEBUG_TRACK #define TRACK \ @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- @@ -5,7 +5,7 @@ *: WWW : http://fype.buetow.org *: E-Mail : fype@dev.buetow.org *: - *: Copyright (c) 2005 2006 2007 2008, Paul Buetow (http://www.pb-labs.com) + *: Copyright (c) 2005 2006 2007 2008, Paul C. Buetow (http://www.pb-labs.com) *: All rights reserved. *: *: Redistribution and use in source and binary forms, with or without modi- diff --git a/tmp/test.out b/tmp/test.out index 080145f..5385798 100644 --- a/tmp/test.out +++ b/tmp/test.out @@ -20,6 +20,3 @@ Token (id=00015, line=00005, pos=0016, type=TT_INTEGER, val=1, ival=1, dval=0.00 Token (id=00016, line=00005, pos=0018, type=TT_ADD, val=+, ival=0, dval=0.000000, refs=1) Token (id=00017, line=00005, pos=0021, type=TT_IDENT, val=gc, ival=0, dval=0.000000, refs=1) Token (id=00018, line=00005, pos=0022, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1) -0 -ICOUNT 4 -9 |