Merge remote-tracking branch 'remotes/github/build-010388-scheme' into build-010388-schemebuild-010388-scheme

1 files changed, 28 insertions, 37 deletions

diff --git a/src/fype.c b/src/fype.c
index 23f017f..cc22c03 100644
--- a/src/fype.c
+++ b/src/fype.c
@@ -1,14 +1,13 @@
 /*:*
  *: File: ./src/fype.c
- *: A simple interpreter
- *: 
- *: WWW	: http://fype.buetow.org
- *: AUTHOR	: http://paul.buetow.org
- *: E-Mail	: fype at dev.buetow.org
- *: 
- *: Copyright (c) 2005 - 2009, Dipl.-Inform. (FH) Paul C. Buetow 
- *: All rights reserved.
- *: 
+ *: A simple Fype interpreter
+ *:
+ *: WWW: http://fype.buetow.org
+ *: AUTHOR: http://paul.buetow.org
+ *: E-Mail: fype at dev.buetow.org
+ *:
+ *: The Fype Language; (c) 2005 - 2010 - Dipl.-Inform. (FH) Paul C. Buetow
+ *:
  *: Redistribution and use in source and binary forms, with or without modi-
  *: fication, are permitted provided that the following conditions are met:
  *:  * Redistributions of source code must retain the above copyright
@@ -16,74 +15,66 @@
  *:  * Redistributions in binary form must reproduce the above copyright
  *:    notice, this list of conditions and the following disclaimer in the
  *:    documentation and/or other materials provided with the distribution.
- *:  * Neither the name of buetow.org nor the names of its contributors may 
- *:    be used to endorse or promote products derived from this software 
+ *:  * Neither the name of buetow.org nor the names of its contributors may
+ *:    be used to endorse or promote products derived from this software
  *:    without specific prior written permission.
- *: 
- *: THIS SOFTWARE IS PROVIDED BY PAUL C. BUETOW AS IS'' AND ANY EXPRESS OR 
- *: IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+ *:
+ *: THIS SOFTWARE IS PROVIDED BY PAUL C. BUETOW AS IS'' AND ANY EXPRESS OR
+ *: IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  *: WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *: DISCLAIMED. IN NO EVENT SHALL PAUL C. BUETOW BE LIABLE FOR ANY DIRECT, 
- *: INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- *: (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- *:  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ *: DISCLAIMED. IN NO EVENT SHALL PAUL C. BUETOW BE LIABLE FOR ANY DIRECT,
+ *: INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *: (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *:  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  *: HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *: STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- *: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ *: STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ *: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *: POSSIBILITY OF SUCH DAMAGE.
  *:*/
 
 #include "fype.h"
 
 #include "argv.h"
-#include "core/garbage.h"
-#include "core/interpret.h"
 #include "core/scanner.h"
-#include "core/symbol.h"
+#include "core/token.h"
+#include "core/interpret.h"
 
-Fype*
+PBSc*
 fype_new() {
-   Fype *p_fype = malloc(sizeof(Fype));
+   PBSc *p_fype = malloc(sizeof(PBSc));
 
    p_fype->p_hash_syms = hash_new(512);
    p_fype->p_list_token = list_new();
    p_fype->p_tupel_argv = tupel_new();
    p_fype->c_basename = NULL;
 
-   garbage_init();
-
    return (p_fype);
 }
 
 void
-fype_delete(Fype *p_fype) {
+fype_delete(PBSc *p_fype) {
    argv_tupel_delete(p_fype->p_tupel_argv);
 
-   hash_iterate(p_fype->p_hash_syms, symbol_cleanup_hash_syms_cb);
    hash_delete(p_fype->p_hash_syms);
 
-   //list_iterate(p_fype->p_list_token, token_print_cb);
-   list_iterate(p_fype->p_list_token, token_ref_down_cb);
-   //list_iterate(p_fype->p_list_token, token_print_cb);
+   list_iterate(p_fype->p_list_token, token_delete_cb);
    list_delete(p_fype->p_list_token);
 
    if (p_fype->c_basename)
       free(p_fype->c_basename);
-
-   garbage_destroy();
 }
 
 int
 fype_run(int i_argc, char **pc_argv) {
-   Fype *p_fype = fype_new();
+   PBSc *p_fype = fype_new();
 
    // argv: Maintains command line options
    argv_run(p_fype, i_argc, pc_argv);
 
-   // scanner: Creates a list of token
+   // scanner: Fills the list of tokens
    scanner_run(p_fype);
 
-   // interpret: Interpret the list of token
+   // interpret: Interprets the list of tokens
    interpret_run(p_fype);
 
    fype_delete(p_fype);