rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-12-18 07:16:23 -05:00
Code Releases Activity

Review getnewtoken, introduce getnewtokval and rewrite function evaluation accordingly.

Browse Source
This commit is contained in:
Renaud 2015-09-27 21:11:51 +08:00
parent b5eb424ad0
commit cfa5c7fb65
4 changed files with 88 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bind.c
View File

@ -11,6 +11,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "estruct.h" #include "estruct.h"
@ -439,12 +440,15 @@ static unsigned int getckey( int mflag) {
/* check to see if we are executing a command line */ /* check to see if we are executing a command line */
if( clexec) { if( clexec) {
char tok[ NSTRING] ; /* command incoming */ char *tok ; /* command incoming */
if( TRUE != gettokval( tok, sizeof tok)) /* get the next token */ tok = getnewtokval() ; /* get the next token */
if( tok == NULL)
c = 0 ; /* return dummy key on failure */ c = 0 ; /* return dummy key on failure */
else else {
c = stock( tok) ; c = stock( tok) ;
free( tok) ;
}
} else { /* or the normal way */ } else { /* or the normal way */
if( mflag) if( mflag)
c = get1key() ; c = get1key() ;

105
eval.c
View File

@ -312,9 +312,9 @@ void varinit(void)
*/ */
static char *gtfun( char *fname) { static char *gtfun( char *fname) {
unsigned fnum ; /* index to function to eval */ unsigned fnum ; /* index to function to eval */
char argx[ 512] ; /* last argument, fixed sized allocation */
char *arg1 ; /* value of first argument */ char *arg1 ; /* value of first argument */
char *arg2 ; /* value of second argument */ char *arg2 ; /* value of second argument */
char *arg3 ; /* last argument */
char *retstr ; /* return value */ char *retstr ; /* return value */
int low, high ; /* binary search indexes */ int low, high ; /* binary search indexes */
@ -342,28 +342,26 @@ static char *gtfun( char *fname) {
if (fnum == ARRAY_SIZE(funcs)) if (fnum == ARRAY_SIZE(funcs))
return errorm; return errorm;
arg1 = arg2 = NULL ; arg1 = arg2 = arg3 = NULL ;
assert( clexec == TRUE) ; /* means macarg can be replaced by gettokval */ assert( clexec == TRUE) ; /* means macarg can be replaced by gettokval */
/* if needed, retrieve the first argument */ /* if needed, retrieve the first argument */
if (funcs[fnum].f_type >= MONAMIC) { if (funcs[fnum].f_type >= MONAMIC) {
if( TRUE != gettokval( argx, sizeof argx)) arg1 = getnewtokval() ;
if( arg1 == NULL)
return errorm; return errorm;
/* if needed, retrieve the second argument */ /* if needed, retrieve the second argument */
if (funcs[fnum].f_type >= DYNAMIC) { if (funcs[fnum].f_type >= DYNAMIC) {
arg1 = malloc( strlen( argx) + 1) ; arg2 = getnewtokval() ;
strcpy( arg1, argx) ; if( arg2 == NULL) {
if( TRUE != gettokval( argx, sizeof argx)) {
free( arg1) ; free( arg1) ;
return errorm; return errorm;
} }
/* if needed, retrieve the third argument */ /* if needed, retrieve the third argument */
if (funcs[fnum].f_type >= TRINAMIC) { if (funcs[fnum].f_type >= TRINAMIC) {
arg2 = malloc( strlen( argx) + 1) ; arg3 = getnewtokval() ;
strcpy( arg2, argx) ; if( arg3 == NULL) {
if( TRUE != gettokval( argx, sizeof argx)) {
free( arg1) ; free( arg1) ;
free( arg2) ; free( arg2) ;
return errorm; return errorm;
@ -377,30 +375,30 @@ static char *gtfun( char *fname) {
int sz ; int sz ;
case UFADD | DYNAMIC: case UFADD | DYNAMIC:
retstr = i_to_a( atoi( arg1) + atoi( argx)) ; retstr = i_to_a( atoi( arg1) + atoi( arg2)) ;
break ; break ;
case UFSUB | DYNAMIC: case UFSUB | DYNAMIC:
retstr = i_to_a( atoi( arg1) - atoi( argx)) ; retstr = i_to_a( atoi( arg1) - atoi( arg2)) ;
break ; break ;
case UFTIMES | DYNAMIC: case UFTIMES | DYNAMIC:
retstr = i_to_a( atoi( arg1) * atoi( argx)) ; retstr = i_to_a( atoi( arg1) * atoi( arg2)) ;
break ; break ;
case UFDIV | DYNAMIC: case UFDIV | DYNAMIC:
sz = atoi( argx) ; sz = atoi( arg2) ;
retstr = (sz == 0) ? errorm : i_to_a( atoi( arg1) / sz) ; retstr = (sz == 0) ? errorm : i_to_a( atoi( arg1) / sz) ;
break ; break ;
case UFMOD | DYNAMIC: case UFMOD | DYNAMIC:
sz = atoi( argx) ; sz = atoi( arg2) ;
retstr = (sz == 0) ? errorm : i_to_a( atoi( arg1) % sz) ; retstr = (sz == 0) ? errorm : i_to_a( atoi( arg1) % sz) ;
break ; break ;
case UFNEG | MONAMIC: case UFNEG | MONAMIC:
retstr = i_to_a( -atoi( argx)) ; retstr = i_to_a( -atoi( arg1)) ;
break ; break ;
case UFCAT | DYNAMIC: { case UFCAT | DYNAMIC: {
int sz1 ; int sz1 ;
sz1 = strlen( arg1) ; sz1 = strlen( arg1) ;
sz = sz1 + strlen( argx) + 1 ; sz = sz1 + strlen( arg2) + 1 ;
if( sz > ressize) { if( sz > ressize) {
free( result) ; free( result) ;
result = malloc( sz) ; result = malloc( sz) ;
@ -408,12 +406,12 @@ static char *gtfun( char *fname) {
} }
strcpy( result, arg1) ; strcpy( result, arg1) ;
strcpy( &result[ sz1], argx) ; strcpy( &result[ sz1], arg2) ;
retstr = result ; retstr = result ;
} }
break ; break ;
case UFLEFT | DYNAMIC: case UFLEFT | DYNAMIC:
sz = atoi( argx) ; sz = atoi( arg2) ;
if( sz >= ressize) { if( sz >= ressize) {
free( result) ; free( result) ;
result = malloc( sz + 1) ; result = malloc( sz + 1) ;
@ -425,7 +423,7 @@ static char *gtfun( char *fname) {
retstr = result ; retstr = result ;
break ; break ;
case UFRIGHT | DYNAMIC: case UFRIGHT | DYNAMIC:
sz = atoi( argx) ; sz = atoi( arg2) ;
if( sz >= ressize) { if( sz >= ressize) {
free( result) ; free( result) ;
result = malloc( sz + 1) ; result = malloc( sz + 1) ;
@ -435,7 +433,7 @@ static char *gtfun( char *fname) {
retstr = strcpy( result, &arg1[ strlen( arg1) - sz]) ; retstr = strcpy( result, &arg1[ strlen( arg1) - sz]) ;
break ; break ;
case UFMID | TRINAMIC: case UFMID | TRINAMIC:
sz = atoi( argx) ; sz = atoi( arg3) ;
if( sz >= ressize) { if( sz >= ressize) {
free( result) ; free( result) ;
result = malloc( sz + 1) ; result = malloc( sz + 1) ;
@ -447,28 +445,28 @@ static char *gtfun( char *fname) {
retstr = result ; retstr = result ;
break ; break ;
case UFNOT | MONAMIC: case UFNOT | MONAMIC:
retstr = ltos( stol( argx) == FALSE) ; retstr = ltos( stol( arg1) == FALSE) ;
break ; break ;
case UFEQUAL | DYNAMIC: case UFEQUAL | DYNAMIC:
retstr = ltos( atoi( arg1) == atoi( argx)) ; retstr = ltos( atoi( arg1) == atoi( arg2)) ;
break ; break ;
case UFLESS | DYNAMIC: case UFLESS | DYNAMIC:
retstr = ltos( atoi( arg1) < atoi( argx)) ; retstr = ltos( atoi( arg1) < atoi( arg2)) ;
break ; break ;
case UFGREATER | DYNAMIC: case UFGREATER | DYNAMIC:
retstr = ltos( atoi( arg1) > atoi( argx)) ; retstr = ltos( atoi( arg1) > atoi( arg2)) ;
break ; break ;
case UFSEQUAL | DYNAMIC: case UFSEQUAL | DYNAMIC:
retstr = ltos( strcmp( arg1, argx) == 0) ; retstr = ltos( strcmp( arg1, arg2) == 0) ;
break ; break ;
case UFSLESS | DYNAMIC: case UFSLESS | DYNAMIC:
retstr = ltos( strcmp( arg1, argx) < 0) ; retstr = ltos( strcmp( arg1, arg2) < 0) ;
break ; break ;
case UFSGREAT | DYNAMIC: case UFSGREAT | DYNAMIC:
retstr = ltos( strcmp( arg1, argx) > 0) ; retstr = ltos( strcmp( arg1, arg2) > 0) ;
break ; break ;
case UFIND | MONAMIC: case UFIND | MONAMIC:
retstr = getval( argx) ; retstr = getval( arg1) ;
sz = strlen( retstr) + 1 ; sz = strlen( retstr) + 1 ;
if( sz > ressize) { if( sz > ressize) {
free( result) ; free( result) ;
@ -479,42 +477,42 @@ static char *gtfun( char *fname) {
retstr = strcpy( result, retstr) ; retstr = strcpy( result, retstr) ;
break ; break ;
case UFAND | DYNAMIC: case UFAND | DYNAMIC:
retstr = ltos( stol( arg1) && stol( argx)) ; retstr = ltos( stol( arg1) && stol( arg2)) ;
break ; break ;
case UFOR | DYNAMIC: case UFOR | DYNAMIC:
retstr = ltos( stol( arg1) || stol( argx)) ; retstr = ltos( stol( arg1) || stol( arg2)) ;
break ; break ;
case UFLENGTH | MONAMIC: case UFLENGTH | MONAMIC:
retstr = i_to_a( strlen( argx)) ; retstr = i_to_a( strlen( arg1)) ;
break ; break ;
case UFUPPER | MONAMIC: case UFUPPER | MONAMIC:
sz = strlen( argx) ; sz = strlen( arg1) ;
if( sz >= ressize) { if( sz >= ressize) {
free( result) ; free( result) ;
result = malloc( sz + 1) ; result = malloc( sz + 1) ;
ressize = sz + 1 ; ressize = sz + 1 ;
} }
retstr = mkupper( result, argx) ; retstr = mkupper( result, arg1) ;
break ; break ;
case UFLOWER | MONAMIC: case UFLOWER | MONAMIC:
sz = strlen( argx) ; sz = strlen( arg1) ;
if( sz >= ressize) { if( sz >= ressize) {
free( result) ; free( result) ;
result = malloc( sz + 1) ; result = malloc( sz + 1) ;
ressize = sz + 1 ; ressize = sz + 1 ;
} }
strcpy( result, argx) ; /* result is at least as long as argx */ strcpy( result, arg1) ; /* result is at least as long as arg1 */
retstr = mklower( result) ; retstr = mklower( result) ;
break ; break ;
case UFTRUTH | MONAMIC: case UFTRUTH | MONAMIC:
retstr = ltos( atoi( argx) == 42) ; retstr = ltos( atoi( arg1) == 42) ;
break ; break ;
case UFASCII | MONAMIC: { case UFASCII | MONAMIC: {
unicode_t c ; unicode_t c ;
utf8_to_unicode( argx, 0, 4, &c) ; utf8_to_unicode( arg1, 0, 4, &c) ;
retstr = i_to_a( c) ; retstr = i_to_a( c) ;
} }
@ -522,7 +520,7 @@ static char *gtfun( char *fname) {
case UFCHR | MONAMIC: { case UFCHR | MONAMIC: {
unicode_t c ; unicode_t c ;
c = atoi( argx) ; c = atoi( arg1) ;
if( c > 0x10FFFF) if( c > 0x10FFFF)
retstr = errorm ; retstr = errorm ;
else { else {
@ -539,7 +537,7 @@ static char *gtfun( char *fname) {
retstr = result ; retstr = result ;
break ; break ;
case UFRND | MONAMIC: case UFRND | MONAMIC:
sz = abs( atoi( argx)) ; sz = abs( atoi( arg1)) ;
if( sz == 0) if( sz == 0)
sz = ernd() ; sz = ernd() ;
else else
@ -548,14 +546,14 @@ static char *gtfun( char *fname) {
retstr = i_to_a( sz) ; retstr = i_to_a( sz) ;
break ; break ;
case UFABS | MONAMIC: case UFABS | MONAMIC:
retstr = i_to_a( abs( atoi( argx))) ; retstr = i_to_a( abs( atoi( arg1))) ;
break ; break ;
case UFSINDEX | DYNAMIC: case UFSINDEX | DYNAMIC:
retstr = i_to_a( sindex( arg1, argx)) ; retstr = i_to_a( sindex( arg1, arg2)) ;
break ; break ;
case UFENV | MONAMIC: case UFENV | MONAMIC:
#if ENVFUNC #if ENVFUNC
retstr = getenv( argx) ; retstr = getenv( arg1) ;
if( retstr == NULL) if( retstr == NULL)
retstr = "" ; retstr = "" ;
#else #else
@ -563,36 +561,39 @@ static char *gtfun( char *fname) {
#endif #endif
break ; break ;
case UFBIND | MONAMIC: case UFBIND | MONAMIC:
retstr = transbind( argx) ; retstr = transbind( arg1) ;
break ; break ;
case UFEXIST | MONAMIC: case UFEXIST | MONAMIC:
retstr = ltos( fexist( argx)) ; retstr = ltos( fexist( arg1)) ;
break ; break ;
case UFFIND | MONAMIC: case UFFIND | MONAMIC:
retstr = flook( argx, TRUE) ; retstr = flook( arg1, TRUE) ;
if( retstr == NULL) if( retstr == NULL)
retstr = "" ; retstr = "" ;
break ; break ;
case UFBAND | DYNAMIC: case UFBAND | DYNAMIC:
retstr = i_to_a( atoi( arg1) & atoi( argx)) ; retstr = i_to_a( atoi( arg1) & atoi( arg2)) ;
break ; break ;
case UFBOR | DYNAMIC: case UFBOR | DYNAMIC:
retstr = i_to_a( atoi( arg1) | atoi( argx)) ; retstr = i_to_a( atoi( arg1) | atoi( arg2)) ;
break ; break ;
case UFBXOR | DYNAMIC: case UFBXOR | DYNAMIC:
retstr = i_to_a( atoi( arg1) ^ atoi( argx)) ; retstr = i_to_a( atoi( arg1) ^ atoi( arg2)) ;
break ; break ;
case UFBNOT | DYNAMIC: case UFBNOT | MONAMIC:
retstr = i_to_a( ~atoi( argx)) ; retstr = i_to_a( ~atoi( arg1)) ;
break ; break ;
case UFXLATE | TRINAMIC: case UFXLATE | TRINAMIC:
retstr = xlat( arg1, arg2, argx) ; retstr = xlat( arg1, arg2, arg3) ;
break ; break ;
default: default:
assert( FALSE) ; /* never should get here */ assert( FALSE) ; /* never should get here */
retstr = errorm ; retstr = errorm ;
} }
if( arg3)
free( arg3) ;
if( arg2) if( arg2)
free( arg2) ; free( arg2) ;

29
exec.c
View File

@ -327,15 +327,18 @@ void gettoken( char *tok, int maxtoksize) {
execstr = token( execstr, tok, maxtoksize) ; execstr = token( execstr, tok, maxtoksize) ;
} }
void getnewtoken( char **tokref) { static char *getnewtoken( void) {
execstr = newtoken( execstr, tokref) ; char *tok ;
execstr = newtoken( execstr, &tok) ;
return tok ;
} }
boolean gettokval( char *tok, int size) { boolean gettokval( char *tok, int size) {
char *tmpbuf ; char *tmpbuf ;
/* grab token and advance past */ /* grab token and advance past */
getnewtoken( &tmpbuf) ; tmpbuf = getnewtoken() ;
if( tmpbuf == NULL) if( tmpbuf == NULL)
return FALSE ; return FALSE ;
@ -346,6 +349,26 @@ boolean gettokval( char *tok, int size) {
return TRUE ; return TRUE ;
} }
char *getnewtokval( void) {
char *tmpbuf ;
char *tmpval ;
char *valbuf ;
/* grab token and advance past */
tmpbuf = getnewtoken() ;
if( tmpbuf == NULL)
return NULL ;
/* evaluate it */
tmpval = getval( tmpbuf) ;
valbuf = malloc( strlen( tmpval) + 1 ) ;
if( valbuf != NULL)
strcpy( valbuf, tmpval) ;
free( tmpbuf) ;
return valbuf ;
}
/* /*
* get a macro line argument * get a macro line argument
* *

1
exec.h
View File

@ -20,6 +20,7 @@ int namedcmd( int f, int n) ;
int execcmd( int f, int n) ; int execcmd( int f, int n) ;
void gettoken( char *tok, int maxtoksize) ; void gettoken( char *tok, int maxtoksize) ;
boolean gettokval( char *tok, int maxtoksize) ; boolean gettokval( char *tok, int maxtoksize) ;
char *getnewtokval( void) ;
int storemac( int f, int n) ; int storemac( int f, int n) ;
int execbuf( int f, int n) ; int execbuf( int f, int n) ;
int execfile( int f, int n) ; int execfile( int f, int n) ;