aboutsummaryrefslogtreecommitdiff
path: root/prefix.c
diff options
context:
space:
mode:
Diffstat (limited to 'prefix.c')
-rw-r--r--prefix.c131
1 files changed, 56 insertions, 75 deletions
diff --git a/prefix.c b/prefix.c
index ee3472a6ed46..40243ec90b93 100644
--- a/prefix.c
+++ b/prefix.c
@@ -4,7 +4,7 @@
** Parser extensions for Ficl
** Authors: Larry Hastings & John Sadler (john_sadler@alum.mit.edu)
** Created: April 2001
-** $Id: prefix.c,v 1.5 2001-12-04 17:58:13-08 jsadler Exp jsadler $
+** $Id: prefix.c,v 1.8 2010/09/13 18:43:04 asau Exp $
*******************************************************************/
/*
** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu)
@@ -12,9 +12,9 @@
**
** Get the latest Ficl release at http://ficl.sourceforge.net
**
-** I am interested in hearing from anyone who uses ficl. If you have
+** I am interested in hearing from anyone who uses Ficl. If you have
** a problem, a success story, a defect, an enhancement request, or
-** if you would like to contribute to the ficl release, please
+** if you would like to contribute to the Ficl release, please
** contact me by email at the address above.
**
** L I C E N S E and D I S C L A I M E R
@@ -44,7 +44,6 @@
#include <string.h>
#include <ctype.h>
#include "ficl.h"
-#include "math64.h"
/*
** (jws) revisions:
@@ -65,85 +64,67 @@ static char list_name[] = "<prefixes>";
/**************************************************************************
f i c l P a r s e P r e f i x
** This is the parse step for prefixes - it checks an incoming word
-** to see if it starts with a prefix, and if so runs the corrseponding
+** to see if it starts with a prefix, and if so runs the corresponding
** code against the remainder of the word and returns true.
**************************************************************************/
-int ficlParsePrefix(FICL_VM *pVM, STRINGINFO si)
+int ficlVmParsePrefix(ficlVm *vm, ficlString s)
{
int i;
- FICL_HASH *pHash;
- FICL_WORD *pFW = ficlLookup(pVM->pSys, list_name);
+ ficlHash *hash;
+ ficlWord *word = ficlSystemLookup(vm->callback.system, list_name);
/*
** Make sure we found the prefix dictionary - otherwise silently fail
** If forth-wordlist is not in the search order, we won't find the prefixes.
*/
- if (!pFW)
- return FICL_FALSE;
+ if (!word)
+ return 0; /* false */
- pHash = (FICL_HASH *)(pFW->param[0].p);
+ hash = (ficlHash *)(word->param[0].p);
/*
** Walk the list looking for a match with the beginning of the incoming token
*/
- for (i = 0; i < (int)pHash->size; i++)
+ for (i = 0; i < (int)hash->size; i++)
{
- pFW = pHash->table[i];
- while (pFW != NULL)
+ word = hash->table[i];
+ while (word != NULL)
{
int n;
- n = pFW->nName;
+ n = word->length;
/*
** If we find a match, adjust the TIB to give back the non-prefix characters
** and execute the prefix word.
*/
- if (!strincmp(SI_PTR(si), pFW->name, (FICL_UNS)n))
+ if (!ficlStrincmp(FICL_STRING_GET_POINTER(s), word->name, (ficlUnsigned)n))
{
/* (sadler) fixed off-by-one error when the token has no trailing space in the TIB */
- vmSetTibIndex(pVM, si.cp + n - pVM->tib.cp );
- vmExecute(pVM, pFW);
+ ficlVmSetTibIndex(vm, s.text + n - vm->tib.text);
+ ficlVmExecuteWord(vm, word);
- return FICL_TRUE;
+ return 1; /* true */
}
- pFW = pFW->link;
+ word = word->link;
}
}
- return FICL_FALSE;
+ return 0; /* false */
}
-static void tempBase(FICL_VM *pVM, int base)
+static void ficlPrimitiveTempBase(ficlVm *vm)
{
- int oldbase = pVM->base;
- STRINGINFO si = vmGetWord0(pVM);
+ int oldbase = vm->base;
+ ficlString number = ficlVmGetWord0(vm);
+ int base = ficlStackPopInteger(vm->dataStack);
- pVM->base = base;
- if (!ficlParseNumber(pVM, si))
- {
- int i = SI_COUNT(si);
- vmThrowErr(pVM, "%.*s not recognized", i, SI_PTR(si));
- }
+ vm->base = base;
+ if (!ficlVmParseNumber(vm, number))
+ ficlVmThrowError(vm, "%.*s not recognized", FICL_STRING_GET_LENGTH(number), FICL_STRING_GET_POINTER(number));
- pVM->base = oldbase;
+ vm->base = oldbase;
return;
}
-static void fTempBase(FICL_VM *pVM)
-{
- int base = stackPopINT(pVM->pStack);
- tempBase(pVM, base);
- return;
-}
-
-static void prefixHex(FICL_VM *pVM)
-{
- tempBase(pVM, 16);
-}
-
-static void prefixTen(FICL_VM *pVM)
-{
- tempBase(pVM, 10);
-}
/**************************************************************************
@@ -153,45 +134,45 @@ static void prefixTen(FICL_VM *pVM)
** If they need to generate code in compile state you must add
** this code explicitly.
**************************************************************************/
-void ficlCompilePrefix(FICL_SYSTEM *pSys)
+void ficlSystemCompilePrefix(ficlSystem *system)
{
- FICL_DICT *dp = pSys->dp;
- FICL_HASH *pHash;
- FICL_HASH *pPrevCompile = dp->pCompile;
-#if (FICL_EXTENDED_PREFIX)
- FICL_WORD *pFW;
-#endif
+ ficlDictionary *dictionary = system->dictionary;
+ ficlHash *hash;
/*
** Create a named wordlist for prefixes to reside in...
** Since we're doing a special kind of search, make it
** a single bucket hashtable - hashing does not help here.
*/
- pHash = dictCreateWordlist(dp, 1);
- pHash->name = list_name;
- dictAppendWord(dp, list_name, constantParen, FW_DEFAULT);
- dictAppendCell(dp, LVALUEtoCELL(pHash));
+ hash = ficlDictionaryCreateWordlist(dictionary, 1);
+ hash->name = list_name;
+ ficlDictionaryAppendConstantPointer(dictionary, list_name, hash);
- /*
- ** Put __tempbase in the forth-wordlist
- */
- dictAppendWord(dp, "__tempbase", fTempBase, FW_DEFAULT);
+ /*
+ ** Put __tempbase in the forth-wordlist
+ */
+ ficlDictionarySetPrimitive(dictionary, "__tempbase", ficlPrimitiveTempBase, FICL_WORD_DEFAULT);
/*
- ** Temporarily make the prefix list the compile wordlist so that
- ** we can create some precompiled prefixes.
+ ** If you want to add some prefixes at compilation-time, copy this line to the top of this function:
+ **
+ ficlHash *oldCompilationWordlist;
+
+ **
+ ** then copy this code to the bottom, just above the return:
+ **
+
+ oldCompilationWordlist = dictionary->compilationWordlist;
+ dictionary->compilationWordlist = hash;
+ ficlDictionarySetPrimitive(dictionary, YOUR WORD HERE, FICL_WORD_DEFAULT);
+ dictionary->compilationWordlist = oldCompilationWordlist;
+
+ **
+ ** and substitute in your own actual calls to ficlDictionarySetPrimitive() as needed.
+ **
+ ** Or--better yet--do it in your own code, so you don't have to re-modify the Ficl
+ ** source code every time we cut a new release!
*/
- dp->pCompile = pHash;
- dictAppendWord(dp, "0x", prefixHex, FW_DEFAULT);
- dictAppendWord(dp, "0d", prefixTen, FW_DEFAULT);
-#if (FICL_EXTENDED_PREFIX)
- pFW = ficlLookup(pSys, "\\");
- if (pFW)
- {
- dictAppendWord(dp, "//", pFW->code, FW_DEFAULT);
- }
-#endif
- dp->pCompile = pPrevCompile;
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:45:25 +0000