misc cleanup
This commit is contained in:
parent
8f695e0479
commit
38e80da075
13
Keywords.txt
13
Keywords.txt
@ -1,5 +1,6 @@
|
|||||||
ADDR
|
ADDR
|
||||||
AND
|
AND
|
||||||
|
ARRAY
|
||||||
AS
|
AS
|
||||||
BEGIN
|
BEGIN
|
||||||
BOOL
|
BOOL
|
||||||
@ -10,10 +11,12 @@ CASE_ELSE
|
|||||||
CHAR
|
CHAR
|
||||||
CLASS
|
CLASS
|
||||||
CLASS
|
CLASS
|
||||||
|
CLS
|
||||||
CONSTANT
|
CONSTANT
|
||||||
CONSTRUCTOR
|
CONSTRUCTOR
|
||||||
DECLARE
|
DECLARE
|
||||||
DECR
|
DECR
|
||||||
|
DEF
|
||||||
DIM
|
DIM
|
||||||
DO
|
DO
|
||||||
ELSE
|
ELSE
|
||||||
@ -34,12 +37,15 @@ FALSE
|
|||||||
FOR
|
FOR
|
||||||
FORMAT$
|
FORMAT$
|
||||||
FUNCTION
|
FUNCTION
|
||||||
|
GRAB$
|
||||||
IF
|
IF
|
||||||
INCR
|
INCR
|
||||||
INSTR
|
INSTR
|
||||||
INT
|
INT
|
||||||
|
INTEGER
|
||||||
LCASE$
|
LCASE$
|
||||||
LEFT$
|
LEFT$
|
||||||
|
LEN(
|
||||||
LOADFILE$
|
LOADFILE$
|
||||||
LPCHAR
|
LPCHAR
|
||||||
LTRIM$
|
LTRIM$
|
||||||
@ -48,10 +54,15 @@ MAP
|
|||||||
MCASE$
|
MCASE$
|
||||||
MID$
|
MID$
|
||||||
NEXT
|
NEXT
|
||||||
|
NL
|
||||||
NOT
|
NOT
|
||||||
OR
|
OR
|
||||||
PRINT
|
PRINT
|
||||||
|
PRINTNL
|
||||||
PTR
|
PTR
|
||||||
|
REGEX
|
||||||
|
REGMATCH
|
||||||
|
REGQUERY
|
||||||
REPLACE$
|
REPLACE$
|
||||||
RETURN
|
RETURN
|
||||||
REVERSE$
|
REVERSE$
|
||||||
@ -64,6 +75,8 @@ SPLIT
|
|||||||
SPLITPATH$
|
SPLITPATH$
|
||||||
STEP
|
STEP
|
||||||
STR$
|
STR$
|
||||||
|
STR$
|
||||||
|
STRARRAY
|
||||||
SUB
|
SUB
|
||||||
THEN
|
THEN
|
||||||
TO
|
TO
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
ENC$ (CSTRING A, INT L, INT R)
|
ENC$ (CSTRING A, INT L, INT R)
|
||||||
FORMAT$ (CONSTANT CSTRING &fmt, ...)
|
FORMAT$ (CONSTANT CSTRING fmt, ...)
|
||||||
|
GRAB$(CONSTANT CSTRING &src, CONSTANT CSTRING &start, CONSTANT CSTRING &stop)
|
||||||
INSTR (CSTRING s,CSTRING match, size_t offset)
|
INSTR (CSTRING s,CSTRING match, size_t offset)
|
||||||
LCASE$ (CSTRING str)
|
LCASE$ (CSTRING str)
|
||||||
LEFT$ (CSTRING s, INT length)
|
LEFT$ (CSTRING s, INT length)
|
||||||
@ -8,6 +9,7 @@ LTRIM$ (CSTRING s)
|
|||||||
MCASE$ (CSTRING S)
|
MCASE$ (CSTRING S)
|
||||||
MID$ (CSTRING s, INT start, INT length)
|
MID$ (CSTRING s, INT start, INT length)
|
||||||
PRINT (CSTRING A="")
|
PRINT (CSTRING A="")
|
||||||
|
REGEX (CSTRING src, CSTRING query)
|
||||||
REPLACE$ (CSTRING subject, CONSTANT CSTRING& search, CONSTANT CSTRING& replace)
|
REPLACE$ (CSTRING subject, CONSTANT CSTRING& search, CONSTANT CSTRING& replace)
|
||||||
REVERSE$ (CSTRING src)
|
REVERSE$ (CSTRING src)
|
||||||
RIGHT$ (CSTRING s, INT length)
|
RIGHT$ (CSTRING s, INT length)
|
||||||
|
@ -67,7 +67,8 @@
|
|||||||
#define WEND }
|
#define WEND }
|
||||||
#define RETURN return
|
#define RETURN return
|
||||||
#define CONSTANT const
|
#define CONSTANT const
|
||||||
#define STR$( x ) dynamic_cast< std::ostringstream & >( ( std::ostringstream() << std::dec << x ) ).str()
|
// #define STR$( x ) dynamic_cast< std::ostringstream & >( ( std::ostringstream() << std::dec << x ) ).str()
|
||||||
|
#define STR$(x) std::to_string(x)
|
||||||
#define BOOL bool
|
#define BOOL bool
|
||||||
#define INT int
|
#define INT int
|
||||||
#define INTEGER int
|
#define INTEGER int
|
||||||
|
@ -24,8 +24,10 @@ FUNCTION CSTRING REGEX (CSTRING src, CSTRING query) {
|
|||||||
CSTRING result;
|
CSTRING result;
|
||||||
REGMATCH match;
|
REGMATCH match;
|
||||||
REGQUERY term(query);
|
REGQUERY term(query);
|
||||||
if (regex_search(src, match, term) == true)
|
if (regex_search(src, match, term,std::regex_constants::match_any) == true){
|
||||||
|
std::cout << match.size() << std::endl;
|
||||||
result = match[1];
|
result = match[1];
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
ENDFUNCTION
|
ENDFUNCTION
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user