projects
/
pforth
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[readme] Updated readme.txt to reflect new home on GitHub
[pforth]
/
csrc
/
pf_main.c
diff --git
a/csrc/pf_main.c
b/csrc/pf_main.c
index
6b07f33
..
a973553
100644
(file)
--- a/
csrc/pf_main.c
+++ b/
csrc/pf_main.c
@@
-43,21
+43,13
@@
#define TRUE (1)
\r
#define FALSE (0)
\r
#endif
\r
#define TRUE (1)
\r
#define FALSE (0)
\r
#endif
\r
-
-static const char *gErrorMsg32Bit = "ERROR - A long is not 4 bytes. Are we running on a 64-bit machine?!\n";
\r
#ifdef PF_EMBEDDED
\r
int main( void )
\r
{
\r
char IfInit = 0;
\r
const char *DicName = NULL;
\r
\r
#ifdef PF_EMBEDDED
\r
int main( void )
\r
{
\r
char IfInit = 0;
\r
const char *DicName = NULL;
\r
- const char *SourceName = NULL;
- // Check to make sure we are running in 32-bit mode.
- if( sizeof(long) != 4 )
- {
- pfMessage(gErrorMsg32Bit);
- return 1;
- }
\r
+ const char *SourceName = NULL;
\r
pfMessage("\npForth Embedded\n");
\r
return pfDoForth( DicName, SourceName, IfInit);
\r
}
\r
pfMessage("\npForth Embedded\n");
\r
return pfDoForth( DicName, SourceName, IfInit);
\r
}
\r
@@
-74,21
+66,15
@@
int main( int argc, char **argv )
const char *SourceName = NULL;
\r
char IfInit = FALSE;
\r
char *s;
\r
const char *SourceName = NULL;
\r
char IfInit = FALSE;
\r
char *s;
\r
-
int32
i;
\r
+
cell_t
i;
\r
int Result;
\r
int Result;
\r
-
- // Check to make sure we are running in 32-bit mode.
- if( sizeof(long) != 4 )
- {
- ERR((gErrorMsg32Bit));
- return 1;
- }
-
\r
+
\r
/* For Metroworks on Mac */
\r
#ifdef __MWERKS__
\r
argc = ccommand(&argv);
\r
#endif
\r
/* For Metroworks on Mac */
\r
#ifdef __MWERKS__
\r
argc = ccommand(&argv);
\r
#endif
\r
-
\r
+
\r
+ pfSetQuiet( FALSE );
\r
/* Parse command line. */
\r
for( i=1; i<argc; i++ )
\r
{
\r
/* Parse command line. */
\r
for( i=1; i<argc; i++ )
\r
{
\r
@@
-112,8
+98,8
@@
int main( int argc, char **argv )
\r
case 'd':
\r
if( *s != '\0' ) DicName = s;
\r
\r
case 'd':
\r
if( *s != '\0' ) DicName = s;
\r
- /
/ Allow space after -d (Thanks Aleksej Saushev)
\r
- /
/ Make sure there is another argument.
\r
+ /
* Allow space after -d (Thanks Aleksej Saushev) */
\r
+ /
* Make sure there is another argument. */
\r
else if( (i+1) < argc )
\r
{
\r
DicName = argv[++i];
\r
else if( (i+1) < argc )
\r
{
\r
DicName = argv[++i];
\r
@@
-143,6
+129,14
@@
int main( int argc, char **argv )
DicName = NULL;
\r
#endif
\r
\r
DicName = NULL;
\r
#endif
\r
\r
+#ifdef PF_UNIT_TEST
\r
+ if( (Result = pfUnitTest()) != 0 )
\r
+ {
\r
+ ERR(("pForth stopping on unit test failure.\n"));
\r
+ goto on_error;
\r
+ }
\r
+#endif
\r
+
\r
Result = pfDoForth( DicName, SourceName, IfInit);
\r
\r
on_error:
\r
Result = pfDoForth( DicName, SourceName, IfInit);
\r
\r
on_error:
\r