*** empty log message ***
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: awk.h,v 1.178 2007-01-03 04:16:14 bacon Exp $
|
||||
* $Id: awk.h,v 1.179 2007-01-03 09:51:50 bacon Exp $
|
||||
*/
|
||||
|
||||
#ifndef _ASE_AWK_AWK_H_
|
||||
@ -159,7 +159,7 @@ enum
|
||||
ASE_AWK_EXPLICIT = (1 << 1),
|
||||
|
||||
/* a function name should not coincide to be a variable name */
|
||||
ASE_AWK_UNIQUEAFN = (1 << 2),
|
||||
ASE_AWK_UNIQUEFN = (1 << 2),
|
||||
|
||||
/* allow variable shading */
|
||||
ASE_AWK_SHADING = (1 << 3),
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: err.c,v 1.68 2007-01-02 12:25:18 bacon Exp $
|
||||
* $Id: err.c,v 1.69 2007-01-03 09:51:51 bacon Exp $
|
||||
*/
|
||||
|
||||
#include <ase/awk/awk_i.h>
|
||||
@ -28,7 +28,13 @@ void ase_awk_geterror (
|
||||
{
|
||||
if (errnum != ASE_NULL) *errnum = awk->errnum;
|
||||
if (errlin != ASE_NULL) *errlin = awk->errlin;
|
||||
if (errmsg != ASE_NULL) *errmsg = awk->errmsg;
|
||||
if (errmsg != ASE_NULL)
|
||||
{
|
||||
if (awk->errmsg[0] == ASE_T('\0'))
|
||||
*errmsg = ase_awk_geterrstr (awk->errnum);
|
||||
else
|
||||
*errmsg = awk->errmsg;
|
||||
}
|
||||
}
|
||||
|
||||
void ase_awk_seterror (
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: jni.c,v 1.44 2007-01-02 12:25:18 bacon Exp $
|
||||
* $Id: jni.c,v 1.45 2007-01-03 09:51:51 bacon Exp $
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
@ -235,7 +235,7 @@ JNIEXPORT void JNICALL Java_ase_awk_Awk_open (JNIEnv* env, jobject obj)
|
||||
|
||||
(*env)->SetLongField (env, obj, fid_handle, (jlong)awk);
|
||||
|
||||
opt = ASE_AWK_EXPLICIT | ASE_AWK_UNIQUEAFN | ASE_AWK_SHADING |
|
||||
opt = ASE_AWK_EXPLICIT | ASE_AWK_UNIQUEFN | ASE_AWK_SHADING |
|
||||
ASE_AWK_IMPLICIT | ASE_AWK_SHIFT | ASE_AWK_IDIV |
|
||||
ASE_AWK_EXTIO | ASE_AWK_BLOCKLESS | ASE_AWK_HASHSIGN |
|
||||
ASE_AWK_NEXTOFILE;
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: parse.c,v 1.235 2007-01-03 04:16:14 bacon Exp $
|
||||
* $Id: parse.c,v 1.236 2007-01-03 09:51:51 bacon Exp $
|
||||
*/
|
||||
|
||||
#include <ase/awk/awk_i.h>
|
||||
@ -719,7 +719,7 @@ static ase_awk_nde_t* __parse_function (ase_awk_t* awk)
|
||||
return ASE_NULL;
|
||||
}
|
||||
|
||||
if (awk->option & ASE_AWK_UNIQUEAFN)
|
||||
if (awk->option & ASE_AWK_UNIQUEFN)
|
||||
{
|
||||
/* check if it coincides to be a global variable name */
|
||||
ase_size_t g;
|
||||
@ -831,7 +831,7 @@ static ase_awk_nde_t* __parse_function (ase_awk_t* awk)
|
||||
param = ASE_AWK_STR_BUF(&awk->token.name);
|
||||
param_len = ASE_AWK_STR_LEN(&awk->token.name);
|
||||
|
||||
if (awk->option & ASE_AWK_UNIQUEAFN)
|
||||
if (awk->option & ASE_AWK_UNIQUEFN)
|
||||
{
|
||||
/* check if a parameter conflicts with a function */
|
||||
if (ase_awk_strxncmp (name_dup, name_len, param, param_len) == 0 ||
|
||||
@ -1293,7 +1293,7 @@ static ase_awk_t* __add_global (
|
||||
{
|
||||
if (!force)
|
||||
{
|
||||
if (awk->option & ASE_AWK_UNIQUEAFN)
|
||||
if (awk->option & ASE_AWK_UNIQUEFN)
|
||||
{
|
||||
/* check if it conflict with a builtin function name */
|
||||
if (ase_awk_getbfn (awk, name, len) != ASE_NULL)
|
||||
@ -1441,7 +1441,7 @@ static ase_awk_t* __collect_locals (ase_awk_t* awk, ase_size_t nlocals)
|
||||
|
||||
/* NOTE: it is not checked againt globals names */
|
||||
|
||||
if (awk->option & ASE_AWK_UNIQUEAFN)
|
||||
if (awk->option & ASE_AWK_UNIQUEFN)
|
||||
{
|
||||
/* check if it conflict with a builtin function name */
|
||||
if (ase_awk_getbfn (awk, local, local_len) != ASE_NULL)
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: run.c,v 1.318 2007-01-03 04:16:15 bacon Exp $
|
||||
* $Id: run.c,v 1.319 2007-01-03 09:51:52 bacon Exp $
|
||||
*/
|
||||
|
||||
#include <ase/awk/awk_i.h>
|
||||
@ -598,7 +598,13 @@ void ase_awk_getrunerror (
|
||||
{
|
||||
if (errnum != ASE_NULL) *errnum = run->errnum;
|
||||
if (errlin != ASE_NULL) *errlin = run->errlin;
|
||||
if (errmsg != ASE_NULL) *errmsg = run->errmsg;
|
||||
if (errmsg != ASE_NULL)
|
||||
{
|
||||
if (run->errmsg[0] == ASE_T('\0'))
|
||||
*errmsg = ase_awk_geterrstr (run->errnum);
|
||||
else
|
||||
*errmsg = run->errmsg;
|
||||
}
|
||||
}
|
||||
|
||||
void ase_awk_setrunerror (
|
||||
|
Reference in New Issue
Block a user