Refined the rpastat_t public interface. Added more API documentation.

diff --git a/rgrep/rpagrep.c b/rgrep/rpagrep.c
index ae635e9..7396804 100644 (file)
--- a/rgrep/rpagrep.c
+++ b/rgrep/rpagrep.c
@@ -212,9 +212,8 @@ int rpa_grep_match(rpa_grep_t *pGrep, const char* buffer, unsigned long size)
        if (!hStat)
                return -1;
        rpa_stat_cachedisable(hStat, pGrep->disablecache);
-       rpa_stat_setencoding(hStat, pGrep->encoding);
        hStat->debug = pGrep->execdebug;
-       ret = rpa_stat_match(hStat, pGrep->hPattern, input, start, end);
+       ret = rpa_stat_match(hStat, pGrep->hPattern, pGrep->encoding, input, start, end);
        if (ret > 0) {
                rpa_grep_print_filename(pGrep);
                rpa_grep_output(pGrep, input, ret, pGrep->encoding);
@@ -240,9 +239,8 @@ int rpa_grep_parse(rpa_grep_t *pGrep, const char* buffer, unsigned long size)
        if (!hStat)
                return -1;
        rpa_stat_cachedisable(hStat, pGrep->disablecache);
-       rpa_stat_setencoding(hStat, pGrep->encoding);
        hStat->debug = pGrep->execdebug;
-       ret = rpa_stat_parse(hStat, pGrep->hPattern, input, start, end, records);
+       ret = rpa_stat_parse(hStat, pGrep->hPattern, pGrep->encoding, input, start, end, records);
        if (ret < 0) {
                rpa_errinfo_t err;
                rpa_stat_lasterrorinfo(hStat, &err);
@@ -302,13 +300,12 @@ int rpa_grep_scan(rpa_grep_t *pGrep, const char* buffer, unsigned long size)
        hStat = rpa_stat_create(pGrep->hDbex, 0);
        if (!hStat)
                return -1;
-       rpa_stat_setencoding(hStat, pGrep->encoding);
        rpa_stat_cachedisable(hStat, pGrep->disablecache);
        hStat->debug = pGrep->execdebug;
        pGrep->cachehit = hStat->cache->hit;
 
 again:
-       ret = rpa_stat_scan(hStat, pGrep->hPattern, input, start, end, &matched);
+       ret = rpa_stat_scan(hStat, pGrep->hPattern, pGrep->encoding, input, start, end, &matched);
        pGrep->cachehit += hStat->cache->hit;
 
        if (ret > 0) {
@@ -340,7 +337,6 @@ int rpa_grep_scan_lines(rpa_grep_t *pGrep, const char* buffer, unsigned long siz
        hStat = rpa_stat_create(pGrep->hDbex, 0);
        if (!hStat)
                return -1;
-       rpa_stat_setencoding(hStat, pGrep->encoding);
        hStat->debug = pGrep->execdebug;
        
 again:
@@ -363,7 +359,7 @@ again:
        }
        if (!lines)
                return 0;
-       ret = rpa_stat_scan(hStat, pGrep->hPattern, lstart, lstart, lend, &matched);
+       ret = rpa_stat_scan(hStat, pGrep->hPattern, pGrep->encoding, lstart, lstart, lend, &matched);
        if (ret > 0) {
                if (!displayed) {
                        displayed = 1;

diff --git a/rjs/rjsparser.c b/rjs/rjsparser.c
index ba2f0b2..377d992 100644 (file)
--- a/rjs/rjsparser.c
+++ b/rjs/rjsparser.c
@@ -95,7 +95,7 @@ rlong rjs_parser_exec(rjs_parser_t *parser, const rchar *script, rsize_t size, r
 {
        rlong res = 0;
        rpastat_t *stat = rpa_stat_create(parser->dbex, 4096);
-       res = rpa_stat_parse(stat, rpa_dbex_last(parser->dbex), script, script, script + size, ast);
+       res = rpa_stat_parse(stat, rpa_dbex_last(parser->dbex), RPA_ENCODING_UTF8, script, script, script + size, ast);
        if (res < 0 && error) {
                rpa_errinfo_t rpaerror;
                rpa_stat_lasterrorinfo(stat, &rpaerror);

diff --git a/rpa/rpaparser.c b/rpa/rpaparser.c
index 07307a2..aa19fe8 100644 (file)
--- a/rpa/rpaparser.c
+++ b/rpa/rpaparser.c
@@ -40,7 +40,7 @@ rlong rpa_parser_load(rpa_parser_t *pa, const rchar *prods, rsize_t size, rarray
        rpastat_t *stat = pa->stat;
 
        rpa_stat_cachedisable(stat, 0);
-       if (rpa_stat_exec(stat, rvm_codegen_getcode(co->cg, 0), pa->main, prods, prods, prods + size, records) < 0)
+       if (rpa_stat_exec(stat, rvm_codegen_getcode(co->cg, 0), pa->main, RPA_ENCODING_UTF8, prods, prods, prods + size, records) < 0)
                return -1;
        ret = (rlong)RVM_CPUREG_GETL(stat->cpu, R0);
        if (ret < 0)

diff --git a/rpa/rpastat.c b/rpa/rpastat.c
index 01bc770..6ad8070 100644 (file)
--- a/rpa/rpastat.c
+++ b/rpa/rpastat.c
@@ -42,7 +42,7 @@ void rpa_stat_cachedisable(rpastat_t *stat, ruint disable)
 }
 
 
-rint rpa_stat_init(rpastat_t *stat, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
+rint rpa_stat_init(rpastat_t *stat, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
 {
        rulong size;
 
@@ -57,6 +57,7 @@ rint rpa_stat_init(rpastat_t *stat, const rchar *input, const rchar *start, cons
        }
        r_memset(&stat->err, 0, sizeof(stat->err));
        size = end - start;
+       stat->encoding = encoding;
        stat->start = start;
        stat->end = end;
        stat->input = input;
@@ -88,18 +89,7 @@ void rpa_stat_cacheinvalidate(rpastat_t *stat)
 }
 
 
-rint rpa_stat_setencoding(rpastat_t *stat, ruint encoding)
-{
-       if (!stat) {
-               return -1;
-       }
-
-       stat->encoding = encoding;
-       return 0;
-}
-
-
-rlong rpa_stat_exec(rpastat_t *stat, rvm_asmins_t *prog, rword off, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
+rlong rpa_stat_exec(rpastat_t *stat, rvm_asmins_t *prog, rword off, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
 {
        rlong ret;
 
@@ -107,7 +97,8 @@ rlong rpa_stat_exec(rpastat_t *stat, rvm_asmins_t *prog, rword off, const rchar
                return -1;
        }
        rpa_stat_cacheinvalidate(stat);
-       rpa_stat_init(stat, input, start, end, records);
+       rpa_stat_init(stat, encoding, input, start, end, records);
+
        if (stat->debug) {
                ret = rvm_cpu_exec_debug(stat->cpu, prog, off);
        } else {
@@ -135,12 +126,12 @@ rlong rpa_stat_exec(rpastat_t *stat, rvm_asmins_t *prog, rword off, const rchar
 }
 
 
-static rlong rpa_stat_exec_rid(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
+static rlong rpa_stat_exec_rid(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
 {
        rlong topsiz = 0;
        rpainput_t *ptp;
 
-       if ((topsiz = rpa_stat_exec(stat, rpa_dbex_executable(stat->dbex), rpa_dbex_executableoffset(stat->dbex, rid),  input, start, end, records)) < 0) {
+       if ((topsiz = rpa_stat_exec(stat, rpa_dbex_executable(stat->dbex), rpa_dbex_executableoffset(stat->dbex, rid), encoding, input, start, end, records)) < 0) {
                return -1;
        }
        if (topsiz <= 0)
@@ -150,12 +141,12 @@ static rlong rpa_stat_exec_rid(rpastat_t *stat, rparule_t rid, const rchar *inpu
 }
 
 
-rlong rpa_stat_scan(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end, const rchar **where)
+rlong rpa_stat_scan(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end, const rchar **where)
 {
        rlong ret;
 
        while (input < end) {
-               ret = rpa_stat_exec_rid(stat, rid, input, start, end, NULL);
+               ret = rpa_stat_exec_rid(stat, rid, encoding, input, start, end, NULL);
                if (ret < 0)
                        return -1;
                if (ret > 0) {
@@ -168,15 +159,15 @@ rlong rpa_stat_scan(rpastat_t *stat, rparule_t rid, const rchar *input, const rc
 }
 
 
-rlong rpa_stat_match(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end)
+rlong rpa_stat_match(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end)
 {
-       return rpa_stat_exec_rid(stat, rid, input, start, end, NULL);
+       return rpa_stat_exec_rid(stat, rid, encoding, input, start, end, NULL);
 }
 
 
-rlong rpa_stat_parse(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
+rlong rpa_stat_parse(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records)
 {
-       return rpa_stat_exec_rid(stat, rid, input, start, end, records);
+       return rpa_stat_exec_rid(stat, rid, encoding, input, start, end, records);
 }
 
 

diff --git a/rpa/rpastat.h b/rpa/rpastat.h
index 7dcd958..f523280 100644 (file)
--- a/rpa/rpastat.h
+++ b/rpa/rpastat.h
@@ -9,12 +9,11 @@
 #define RPA_ENCODING_UTF8 0
 #define RPA_ENCODING_BYTE 1
 #define RPA_ENCODING_UTF16LE 2
-#define RPA_ENCODING_MASK ((1 << 8) - 1)
 #define RPA_ENCODING_ICASE (1 << 8)
 #define RPA_ENCODING_ICASE_BYTE (RPA_ENCODING_BYTE | RPA_ENCODING_ICASE)
 #define RPA_ENCODING_ICASE_UTF8 (RPA_ENCODING_UTF8 | RPA_ENCODING_ICASE)
 #define RPA_ENCODING_ICASE_UTF16LE (RPA_ENCODING_UTF16LE | RPA_ENCODING_ICASE)
-
+#define RPA_ENCODING_MASK ((1 << 8) - 1)
 #define RPA_DEFAULT_STACKSIZE (256 * 1024)
 
 #ifdef __cplusplus
@@ -80,26 +79,115 @@ void rpa_stat_destroy(rpastat_t *stat);
  * Scan the stream using the specified rule id.
  * \param stat Pointer to object of type \ref rpastat_t
  * \param rid Rule ID of the BNF root.
- * \param input The starting point of the operation. <b>Important:</b> input >= start && input < end
+ * \param encoding Input stream encoding. This parameter specifies how to interpret the data in the input stream. If you want the parser to
+ * ignore the case of the parsed data use encodings with _ICASE_. Supported encodings are:
+ *             - RPA_ENCODING_UTF8
+ *             - RPA_ENCODING_UTF16LE
+ *             - RPA_ENCODING_BYTE
+ *             - RPA_ENCODING_ICASE_UTF8
+ *             - RPA_ENCODING_ICASE_UTF16LE
+ *             - RPA_ENCODING_ICASE_BYTE
+ * \param input The starting point of the operation. The input pointer must be: input >= start and input < end
  * \param start The start of the buffer.
- * \param end The end of the buffer, end will never be dereferenced.
+ * \param end The end of the buffer, it should be: end = start + buffersize.
  * \param where If this function returns a number greater than 0 (a match was found) this parameter will be
  *                             initialized with a pointer the place in the buffer where the match was found.
  * \return If successful return the size of the matched string in bytes, if no match was found
  *                     return 0, return negative in case of error.
  */
-rlong rpa_stat_scan(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end, const rchar **where);
-rlong rpa_stat_parse(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end, rarray_t *records);
-rlong rpa_stat_match(rpastat_t *stat, rparule_t rid, const rchar *input, const rchar *start, const rchar *end);
-rlong rpa_stat_exec(rpastat_t *stat, rvm_asmins_t *prog, rword off, const rchar *input, const rchar *start, const rchar *end, rarray_t *records);
+rlong rpa_stat_scan(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end, const rchar **where);
+
+/**
+ * \brief Parse an input stream
+ *
+ * Parse the stream using the specified rule id.
+ * \param stat Pointer to object of type \ref rpastat_t
+ * \param rid Rule ID of the BNF root.
+ * \param encoding Input stream encoding. This parameter specifies how to interpret the data in the input stream. If you want the parser to
+ * ignore the case of the parsed data use encodings with _ICASE_. Supported encodings are:
+ *             - RPA_ENCODING_UTF8
+ *             - RPA_ENCODING_UTF16LE
+ *             - RPA_ENCODING_BYTE
+ *             - RPA_ENCODING_ICASE_UTF8
+ *             - RPA_ENCODING_ICASE_UTF16LE
+ *             - RPA_ENCODING_ICASE_BYTE
+ * \param input The starting point of the operation. The input pointer must be: input >= start and input < end
+ * \param start The start of the buffer.
+ * \param end The end of the buffer, it should be: end = start + buffersize.
+ * \param records If the function is successful this parameter will be used to
+ *                     store the AST records the parser generates. The records stored in the array
+ *                     are of type \ref rparecord_t
+ * \return If successful return the size of the matched string in bytes, if the input stream cannot be matched against the BNF
+ *                     return 0, return negative in case of error.
+ */
+rlong rpa_stat_parse(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records);
+
+/**
+ * \brief Match an input stream
+ *
+ * Match the stream using the specified rule id. This function is similar to /ref rpa_stat_parse, but it
+ * doesn't generate parsing records. It just returs the size of the matched input stream.
+ * \param stat Pointer to object of type \ref rpastat_t
+ * \param rid Rule ID of the BNF root.
+ * \param encoding Input stream encoding. This parameter specifies how to interpret the data in the input stream. If you want the parser to
+ * ignore the case of the parsed data use encodings with _ICASE_. Supported encodings are:
+ *             - RPA_ENCODING_UTF8
+ *             - RPA_ENCODING_UTF16LE
+ *             - RPA_ENCODING_BYTE
+ *             - RPA_ENCODING_ICASE_UTF8
+ *             - RPA_ENCODING_ICASE_UTF16LE
+ *             - RPA_ENCODING_ICASE_BYTE
+ * \param input The starting point of the operation. The input pointer must be: input >= start and input < end
+ * \param start The start of the buffer.
+ * \param end The end of the buffer, it should be: end = start + buffersize.
+ * \return If successful return the size of the matched string in bytes, if the input stream cannot be matched against the BNF
+ *                     return 0, return negative in case of error.
+ */
+rlong rpa_stat_match(rpastat_t *stat, rparule_t rid, ruint encoding, const rchar *input, const rchar *start, const rchar *end);
+
+
+/**
+ * \brief Execute the parser byte code to parse/match an input stream.
+ *
+ * This is a low level function used by \ref rpa_stat_parse \ref rpa_stat_match and \ref rpa_stat_scan. You shouldn't
+ * need to use it directly.
+ * \param stat Pointer to object of type \ref rpastat_t
+ * \param prog Byte code
+ * \param off Execution start point
+ * \param encoding Input stream encoding. This parameter specifies how to interpret the data in the input stream. If you want the parser to
+ * ignore the case of the parsed data use encodings with _ICASE_. Supported encodings are:
+ *             - RPA_ENCODING_UTF8
+ *             - RPA_ENCODING_UTF16LE
+ *             - RPA_ENCODING_BYTE
+ *             - RPA_ENCODING_ICASE_UTF8
+ *             - RPA_ENCODING_ICASE_UTF16LE
+ *             - RPA_ENCODING_ICASE_BYTE
+ * \param input The starting point of the operation. The input pointer must be: input >= start and input < end
+ * \param start The start of the buffer.
+ * \param end The end of the buffer, it should be: end = start + buffersize.
+ * \param records If the function is successful this parameter will be used to
+ *                     store the AST records the parser generates. The records stored in the array
+ *                     are of type \ref rparecord_t
+ * \return If successful return the size of the matched string in bytes, if the input stream cannot be matched against the BNF
+ *                     return 0, return negative in case of error.
+ */
+rlong rpa_stat_exec(rpastat_t *stat, rvm_asmins_t *prog, rword off, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records);
+
+
+/**
+ * \brief Abort the current operation.
+ *
+ * Use this function to abort \ref rpa_stat_parse \ref rpa_stat_match and \ref rpa_stat_scan or \ref rpa_stat_exec
+ * \param stat Pointer to object of type \ref rpastat_t
+ * \return If sucessful return 0, otherwise return negative.
+ */
 rint rpa_stat_abort(rpastat_t *stat);
-rint rpa_stat_setencoding(rpastat_t *stat, ruint encoding);
 
 
 /**
  * \brief Return the error code of the last occurred error.
  *
- * \param dbex Pointer to \ref rpadbex_t object.
+ * \param stat Pointer to \ref rpastat_t object.
  * \return The error code of the last occurred error. If this function fails the
  * return value is negative.
  */
@@ -108,7 +196,7 @@ rlong rpa_stat_lasterror(rpastat_t *stat);
 /**
  * \brief Get error information for the last occurred error.
  *
- * \param dbex Pointer to \ref rpadbex_t object.
+ * \param stat Pointer to \ref rpastat_t object.
  * \param errinfo Pointer to \ref rpa_errinfo_t buffer that will be
  * filled with the error information. This parameter cannot be NULL.
  * \return Return 0 if the function is successful or negative otherwise. If this function fails the

diff --git a/rpa/rpastatpriv.h b/rpa/rpastatpriv.h
index 8660935..bfc5b7b 100644 (file)
--- a/rpa/rpastatpriv.h
+++ b/rpa/rpastatpriv.h
@@ -39,7 +39,7 @@ struct rpastat_s {
        rvmcpu_t *cpu;
 };
 
-rint rpa_stat_init(rpastat_t *stat, const rchar *input, const rchar *start, const rchar *end, rarray_t *records);
+rint rpa_stat_init(rpastat_t *stat, ruint encoding, const rchar *input, const rchar *start, const rchar *end, rarray_t *records);
 void rpa_stat_cachedisable(rpastat_t *stat, ruint disable);
 void rpa_stat_cacheinvalidate(rpastat_t *stat);
 rint rpa_stat_matchchr(rpastat_t *stat, rssize_t top, rulong wc);

diff --git a/tests/testrpa/rpacompiler-altexp.c b/tests/testrpa/rpacompiler-altexp.c
index 984a98f..839e878 100644 (file)
--- a/tests/testrpa/rpacompiler-altexp.c
+++ b/tests/testrpa/rpacompiler-altexp.c
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-class.c b/tests/testrpa/rpacompiler-class.c
index cb6e0fa..cc4acc0 100644 (file)
--- a/tests/testrpa/rpacompiler-class.c
+++ b/tests/testrpa/rpacompiler-class.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-exp.c b/tests/testrpa/rpacompiler-exp.c
index 81c10f5..80ff7e1 100644 (file)
--- a/tests/testrpa/rpacompiler-exp.c
+++ b/tests/testrpa/rpacompiler-exp.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-minusexp.c b/tests/testrpa/rpacompiler-minusexp.c
index 03810f9..38fde1a 100644 (file)
--- a/tests/testrpa/rpacompiler-minusexp.c
+++ b/tests/testrpa/rpacompiler-minusexp.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-notexp.c b/tests/testrpa/rpacompiler-notexp.c
index 4c218fc..b66bb11 100644 (file)
--- a/tests/testrpa/rpacompiler-notexp.c
+++ b/tests/testrpa/rpacompiler-notexp.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-rule.c b/tests/testrpa/rpacompiler-rule.c
index 417cae4..5c71e36 100644 (file)
--- a/tests/testrpa/rpacompiler-rule.c
+++ b/tests/testrpa/rpacompiler-rule.c
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-rulealtrec.c b/tests/testrpa/rpacompiler-rulealtrec.c
index 08d07f2..4b83983 100644 (file)
--- a/tests/testrpa/rpacompiler-rulealtrec.c
+++ b/tests/testrpa/rpacompiler-rulealtrec.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+30, records);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+30, records);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpacompiler-ruleloop.c b/tests/testrpa/rpacompiler-ruleloop.c
index d45c022..67bba81 100644 (file)
--- a/tests/testrpa/rpacompiler-ruleloop.c
+++ b/tests/testrpa/rpacompiler-ruleloop.c
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+50);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+50);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_LOO, DA, XX, 5));

diff --git a/tests/testrpa/rpacompiler-ruleloopcls.c b/tests/testrpa/rpacompiler-ruleloopcls.c
index 0be313c..f5bf025 100644 (file)
--- a/tests/testrpa/rpacompiler-ruleloopcls.c
+++ b/tests/testrpa/rpacompiler-ruleloopcls.c
@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
        }
 
        for (i = 0; i < 1000; i++) {
-               rpa_stat_init(stat, teststr, teststr, teststr+170);
+               rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+170);
                rpa_stat_cachedisable(stat, 0);
 
                rvm_cpu_exec(stat->cpu, rvm_codegen_getcode(co->cg, 0), mainoff);

diff --git a/tests/testrpa/rpacompiler-rulerec.c b/tests/testrpa/rpacompiler-rulerec.c
index 55e115a..9e77872 100644 (file)
--- a/tests/testrpa/rpacompiler-rulerec.c
+++ b/tests/testrpa/rpacompiler-rulerec.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, records);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, records);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpavm-matchchr.c b/tests/testrpa/rpavm-matchchr.c
index 687eac7..3270330 100644 (file)
--- a/tests/testrpa/rpavm-matchchr.c
+++ b/tests/testrpa/rpavm-matchchr.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+3, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+3, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpavm-matchrng.c b/tests/testrpa/rpavm-matchrng.c
index 4cca0cb..0db6014 100644 (file)
--- a/tests/testrpa/rpavm-matchrng.c
+++ b/tests/testrpa/rpavm-matchrng.c
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+3, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+3, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpavm-mnode.c b/tests/testrpa/rpavm-mnode.c
index 6320f90..3c08ece 100644 (file)
--- a/tests/testrpa/rpavm-mnode.c
+++ b/tests/testrpa/rpavm-mnode.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));

diff --git a/tests/testrpa/rpavm-ref.c b/tests/testrpa/rpavm-ref.c
index 619ffc8..48fbd15 100644 (file)
--- a/tests/testrpa/rpavm-ref.c
+++ b/tests/testrpa/rpavm-ref.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
        stat = rpa_stat_create(NULL, 4096);
        rvm_cpu_addswitable(stat->cpu, "common_table", common_calltable);
 
-       rpa_stat_init(stat, teststr, teststr, teststr+12, NULL);
+       rpa_stat_init(stat, RPA_ENCODING_UTF8, teststr, teststr, teststr+12, NULL);
 
        mainoff = rvm_codegen_addins(co->cg, rvm_asml(RVM_NOP, XX, XX, XX, -1));
        rvm_codegen_addins(co->cg, rvm_asml(RVM_MOV, R_TOP, DA, XX, -1));