[Forthy-cvs] forthy fcode.c,1.6,1.7 main.c,1.15,1.16 test.txt,1.4,1.5

[Paul P. <ppr...@us...>]

Update of /cvsroot/forthy/forthy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17837

Modified Files:
	fcode.c main.c test.txt 
Log Message:
- some clean up
- realize how crappy my "outer loop" is, must fix to support proper EVALUATE

Index: test.txt
===================================================================
RCS file: /cvsroot/forthy/forthy/test.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test.txt	25 Jul 2004 20:25:47 -0000	1.4
--- test.txt	26 Jul 2004 03:28:30 -0000	1.5
***************
*** 42,46 ****
  : namespace 
  	32 word
! 	"{" cat ncreate last last >body ! immediate
  	does> @ dup voc.push current! 
  ; 
--- 42,46 ----
  : namespace 
  	32 word
! 	"{" cat $create last last >body ! immediate
  	does> @ dup voc.push current! 
  ; 
***************
*** 49,53 ****
  : namespace 
  	32 word
! 	ncreate last dup >body ! immediate
  	does> @
  ; 
--- 49,53 ----
  : namespace 
  	32 word
! 	$create last dup >body ! immediate
  	does> @
  ; 
***************
*** 76,79 ****
--- 76,81 ----
  ;
  
+ : load token $load ;
+ 
  load loadtest1.txt
  

Index: fcode.c
===================================================================
RCS file: /cvsroot/forthy/forthy/fcode.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fcode.c	18 Nov 2003 13:49:41 -0000	1.6
--- fcode.c	26 Jul 2004 03:28:30 -0000	1.7
***************
*** 82,109 ****
  };
  
- /*
- FCFUNC code_table[]=
- {
- 	code_exit_inner,
- 	code_docon,
- 	code_dovar,
- 	code_enter,
- 	code_exit,
- 	code_exit_all,
- 	code_lit_int,
- 	code_lit_float,
- 	code_lit_string,
- 	code_lit_wordref,
- 	code_branch,
- 	code_branch_ne,
- 	code_for,
- 	code_next,
- 	code_break,
- 	code_compile,
- 	code_does,
- 	code_dodoes,
- 	code_dodefer,
- };
- */
  
  void code_lit_int(FSYSTEM *sys)
--- 82,85 ----

Index: main.c
===================================================================
RCS file: /cvsroot/forthy/forthy/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** main.c	25 Jul 2004 20:25:47 -0000	1.15
--- main.c	26 Jul 2004 03:28:30 -0000	1.16
***************
*** 1458,1462 ****
  
  
! void word_ncreate(FSYSTEM *sys)
  {
  	char *str;
--- 1458,1462 ----
  
  
! void word_strcreate(FSYSTEM *sys)
  {
  	char *str;
***************
*** 1480,1496 ****
  
  
! void word_load(FSYSTEM *sys)
  {
  	char *str;
  
- 	fs_scan_word(sys);
  	str=fs_get_string(sys, -1);
- 
  	fs_pop(sys);
- 
  	fs_throw(sys, load_script(sys, str));
  }
  
  
  int load(FSYSTEM *sys)
  {
--- 1480,1504 ----
  
  
! void word_strload(FSYSTEM *sys)
  {
  	char *str;
  
  	str=fs_get_string(sys, -1);
  	fs_pop(sys);
  	fs_throw(sys, load_script(sys, str));
  }
  
  
+ void word_evaluate(FSYSTEM *sys)
+ {
+ 	char *str;
+ 
+ 	str=fs_get_string(sys, -1);
+ 	fs_pop(sys);
+ 	fs_load_input(sys, str);
+ 	fs_throw(sys, FS_READY);
+ }
+ 
+ 
  int load(FSYSTEM *sys)
  {
***************
*** 1578,1582 ****
  	fs_register_func(sys, "j", word_j, FS_DEFAULT);
  	fs_register_func(sys, "k", word_k, FS_DEFAULT);
- //	fs_register_func(sys, "evaluate", fs_evaluate, FS_DEFAULT);
  	fs_register_func(sys, "'", word_tick, FS_DEFAULT);
  	fs_register_func(sys, "name", word_name, FS_DEFAULT);
--- 1586,1589 ----
***************
*** 1626,1632 ****
  	fs_register_func(sys, "randnopush", word_randnopush, FS_DEFAULT);
  	fs_register_func(sys, "defer", word_defer, FS_DEFAULT);
! 	fs_register_func(sys, "ncreate", word_ncreate, FS_DEFAULT);
  	fs_register_func(sys, "int", word_int, FS_DEFAULT);
! 	fs_register_func(sys, "load", word_load, FS_DEFAULT);
  
  	fs_push_int(sys, '\n');
--- 1633,1640 ----
  	fs_register_func(sys, "randnopush", word_randnopush, FS_DEFAULT);
  	fs_register_func(sys, "defer", word_defer, FS_DEFAULT);
! 	fs_register_func(sys, "$create", word_strcreate, FS_DEFAULT);
  	fs_register_func(sys, "int", word_int, FS_DEFAULT);
! 	fs_register_func(sys, "$load", word_strload, FS_DEFAULT);
! //	fs_register_func(sys, "evaluate", word_evaluate, FS_DEFAULT);
  
  	fs_push_int(sys, '\n');
***************
*** 1715,1727 ****
  	for(i=0; i<5; i++)
  		fs_step(sys);
- 
- /*
- //	fs_load_word(sys, handle);
- 	fs_run(sys);
- 	fs_run(sys);
- 
- 	fs_load_string(sys, "test2");
- 	fs_run(sys);
- */
  }
  
--- 1723,1726 ----
***************
*** 1908,1912 ****
  
  #ifdef FORTIFY
- //	Fortify_LeaveScope();
  	Fortify_OutputStatistics();
  	Fortify_ListAllMemory();
--- 1907,1910 ----