diff options
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/cmd-Bridging-Header.h | 6 | ||||
-rw-r--r-- | cmd/cmd.c | 721 | ||||
-rw-r--r-- | cmd/cmd.h | 174 | ||||
-rw-r--r-- | cmd/cmd.swift | 78 | ||||
-rw-r--r-- | cmd/cmd_parse.c | 328 | ||||
-rw-r--r-- | cmd/cmd_parse.h | 8 | ||||
-rw-r--r-- | cmd/debug.h | 69 | ||||
-rw-r--r-- | cmd/queue.h | 533 |
8 files changed, 1917 insertions, 0 deletions
diff --git a/cmd/cmd-Bridging-Header.h b/cmd/cmd-Bridging-Header.h new file mode 100644 index 0000000..89d4ec5 --- /dev/null +++ b/cmd/cmd-Bridging-Header.h @@ -0,0 +1,6 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + +#include "cmd_parse.h" +#include "cmd.h" diff --git a/cmd/cmd.c b/cmd/cmd.c new file mode 100644 index 0000000..f743a7f --- /dev/null +++ b/cmd/cmd.c @@ -0,0 +1,721 @@ +#include "cmd.h" +#include "cmd_parse.h" + +cmd_tok_t* cmd_tok_create( char *s, char *e, int sz, int type ) +{ + cmd_tok_t *ret = NULL; + + ret = malloc( sizeof(cmd_tok_t) ); + if ( ret == NULL ) + return ret; + + memset( ret, 0, sizeof(cmd_tok_t) ); + + ret->s = s; + ret->e = e; + ret->sz = sz; + ret->type = type; + ret->next = NULL; //no need, but sec programming says we need it + + return ret; +} + + +int cmd_tok_add( cmd_tok_t *tok, cmd_tok_t *next ) +{ + int ret = 0; + + if ( tok == NULL ) + { + return -1; + } + + if ( next == NULL ) + { + return -1; + } + + if ( tok->next != NULL ) + { + printf("next token allready set\n"); + return -1; + } + + tok->next = next; + + return ret; +} + + +int cmd_tok_print( cmd_tok_t *tok ) +{ + int ret = 0; + + printf("TOK %p\n",tok); + if (tok) + { + printf("S:%p E:%p SZ:%d \n", tok->s, tok->e, tok->sz); + printf("TYPE: "); + switch (tok->type) + { + case CMDT_NONE: + printf("NONE"); + break; + case CMDT_INT: + printf("INT"); + break; + case CMDT_HEX: + printf("HEX"); + break; + case CMDT_BIN: + printf("BIN"); + break; + case CMDT_STR: + printf("STR"); + break; + case CMDT_WORD: + printf("WORD"); + break; + case CMDT_SP: + printf("SP"); + break; + case CMDT_FLOAT: + printf("FLOAT"); + break; + default: + printf("UNKNOWN"); + } + printf("\n"); + printf("NEXT: %p\n", tok->next ); + } + + return ret; +} + + +void cmd_tok_destroy( cmd_tok_t *tok ) +{ + cmd_tok_t *t=NULL, *n=NULL; + + if (tok == NULL) + { + return; + } + + if ( tok->next == NULL ) + { + free( tok ); + return; + } + + t = tok; + n = t; + while ( n != NULL) + { + n = t->next; + t->next = NULL; + free(t); + t = n; + } +} + + +int cmd_tok_count( cmd_tok_t *tok ) +{ + int ret = 0; + cmd_tok_t *iter = NULL; + + if (tok == NULL) + return 0; + + iter = tok; + while( iter != NULL ) + { + ret += 1; + iter = iter->next; + } + + return ret; +} + + + +cmd_arg_t* cmd_arg_create( cmd_tok_t *tok ) +{ + cmd_arg_t *ret = NULL; + int argc = -1; + cmd_tok_t *iter = NULL; + int i = 0; + + ret = malloc( sizeof(cmd_arg_t) ); + if ( ret == NULL ) + { + return NULL; + } + memset( ret, 0, sizeof( cmd_arg_t )); + + //get number of arguments in command line + argc = cmd_tok_count( tok ); + ret->argc = argc; + + + //alloc mem for argument string values + ret->argv = malloc( sizeof(int*)*argc ); + if ( ret->argv == NULL ) + { + //printf("ERR:err_malloc_argv\n"); + goto err_malloc_argv; + } + memset( ret->argv, 0, sizeof(int*)*argc ); + + //alloc mem for argument type values + ret->type = malloc( sizeof(int)*argc ); + if ( ret->type == NULL ) + { + //printf("ERR:err_malloc_type\n"); + goto err_malloc_type; + } + memset( ret->type, 0, sizeof(int)*argc ); + + //create for each cmd token string and set type + iter = tok; + for (i=0; i<argc; i++,iter=iter->next) + { + ret->argv[i] = malloc( iter->sz+1 ); + memcpy(ret->argv[i], iter->s, iter->sz ); + ret->argv[i][iter->sz] = 0x0; + ret->type[i] = iter->type; + } + + return ret; + +err_malloc_type: + free( ret->argv ); +err_malloc_argv: + free( ret ); + return NULL; +} + + +cmd_arg_t* cmd_arg_sub( cmd_arg_t *arg ) +{ + cmd_arg_t *ret = NULL; + + int i=0; + + if ( arg == NULL ) + return NULL; + + if ( arg->argc == 1 ) + { + ret = cmd_arg_sub_empty(); + return ret; + } + + ret = malloc( sizeof(cmd_arg_t) ); + + ret->argc = arg->argc-1; + + ret->type = malloc(sizeof(int)*(arg->argc-1)); + memset(ret->type, 0, sizeof(int)*(arg->argc-1) ); + + ret->argv = malloc( sizeof(char*)*(arg->argc-1) ); + memset(ret->argv, 0, sizeof(char*)*(arg->argc-1) ); + + ret->__sub_cmd = 1; + + for (i=0; i<ret->argc; i++) + { + ret->argv[i] = arg->argv[i+1]; + ret->type[i] = arg->type[i+1]; + } + + return ret; +} + + +cmd_arg_t* cmd_arg_sub_empty() +{ + cmd_arg_t *ret = NULL; + + ret = malloc( sizeof(cmd_arg_t) ); + ret->argc = 0; + ret->argv = NULL; + ret->type = NULL; + ret->__sub_cmd = 1; + + return ret; +} + +void cmd_arg_destroy( cmd_arg_t *arg ) +{ + int i; + + if ( arg == NULL ) + return; + + for ( i=0; i<arg->argc; i++) + { + if ( arg->__sub_cmd == 0 ) + free( arg->argv[i] ); + } + + free( arg->argv ); + + free( arg->type ); + + free( arg ); +} + +int cmd_exec( cmd_table_t *tbl, cmd_arg_t *arg ) +{ + int ret = -1; + int fret = 0; + int pret = 0; //pre condition return + int i; + + cmd_arg_t *sub_arg = NULL; + + //there could be 0 arguments + if ( arg->argc < 0 ) + { + printf("Hm ... no arguments\n"); + return -1; + } + + if ( arg->argc == 0 ) + return 0; + + i = 0; + while ( (tbl[i].cmd != NULL) && (tbl[i].clb != NULL) ) + { + //printf("tbl.cmd %s\n", tbl[i].cmd ); + if ((strlen(tbl[i].cmd) == strlen(arg->argv[0])) //if there is 0 args then here could be non-0 and we get troubles + && (strlen(tbl[i].cmd) != 0)) //combo if + if ( strncmp( tbl[i].cmd, arg->argv[0], strlen(arg->argv[0]) ) == 0 ) + { + //never will exec becouse of statment in while + if ( tbl[i].clb == NULL ) + { + printf("Empty callback %s\n", tbl[i].cmd); + ret = -1; + break; + } + + sub_arg = cmd_arg_sub( arg ); + //execute callback preconditions + if (tbl[i].pre != NULL) + { + pret = tbl[i].pre( sub_arg ); + } else { + pret = 0; //no precond just pass + } + if (pret == 0) + { + //execute callback + fret = tbl[i].clb( sub_arg ); + } + + //if command whent wrong or not still clean mem + if ( sub_arg != NULL ) + { + cmd_arg_destroy( sub_arg ); + } + + //command execution precondtions met but wrong execution + if ( pret == 0 ) + { + //command execution whent wrong lets go out + if ( fret != 0 ) + { + printf("Command broken execution\n"); + ret = -1; + break; + } + } + ret = 0; //succesfull execution + break; + } + + i++; + } + + return ret; +} + +int cmd_exec_ev( cmd_table_t *tbl, cmd_arg_t *arg, int event ) +{ + int ret = -1; + int fret = 0; + int i; + + cmd_arg_t *sub_arg = NULL; + + if ( arg->argc < 1 ) + { + printf("Hm ... no arguments\n"); + return -1; + } + + i = 0; + while ( (tbl[i].cmd != NULL) && (tbl[i].clb != NULL) ) + { + //printf("tbl.cmd %s\n", tbl[i].cmd ); + if ((strlen(tbl[i].cmd) == strlen(arg->argv[0])) //if there is 0 args then here could be non-0 and we get troubles + && (strlen(tbl[i].cmd) != 0)) //combo if + if ( strncmp( tbl[i].cmd, arg->argv[0], strlen(arg->argv[0]) ) == 0 ) + { + //never will exec becouse of statment in while + if ( tbl[i].clb == NULL ) + { + printf("Empty callback %s\n", tbl[i].cmd); + ret = -1; + break; + } + + sub_arg = cmd_arg_sub( arg ); + + if ( sub_arg == NULL ) + sub_arg = cmd_arg_sub_empty(); + + fret = tbl[i].clb( sub_arg ); + + //if command whent wrong or not still clean mem + if ( sub_arg != NULL ) + { + cmd_arg_destroy( sub_arg ); + } + + //command execution whent wrong lets go out + if ( fret != 0 ) + { + printf("Command broken execution\n"); + ret = -1; + break; + } + ret = 0; + break; + } + + i++; + } + + + return ret; +} + +/* +For now support only first command autocomplete, and return first cmd +RETURN: string to command, dont modify it +*/ +char* cmd_ac( cmd_table_t *tbl, const char *s ) +{ + char *ret = NULL; + int i = -1; + int idx = -1, match=-1;//best match + int ret_match; + int str_ac_sz = strlen(s); + + + i = 0; + while ( (tbl[i].cmd != NULL) && (tbl[i].clb != NULL) ) + { + ret_match = strncmp_ac( s, tbl[i].cmd, str_ac_sz ); + if (ret_match > 0) + { + if (ret_match == str_ac_sz+1) + { + idx = i; + break; + } else + { + if (ret_match > match) + { + idx = i; + match = ret_match; + } + } + } + i++; + } + + if ( idx >= 0 ) + { + ret = tbl[idx].cmd; + } + + return ret; +} + +struct cmd_acq_head_t* cmd_acq( cmd_table_t *tbl, const char *s ) +{ + struct cmd_acq_head_t *ret = NULL; + + int i = -1; + int ret_match; + int str_ac_sz = strlen(s); + + struct cmd_acq_head_t *ac = malloc(sizeof(struct cmd_acq_t)); + + SLIST_INIT(ac); + i = 0; + while ( (tbl[i].cmd != NULL) && (tbl[i].clb != NULL) ) + { + ret_match = strncmp_ac( s, tbl[i].cmd, str_ac_sz ); + if (ret_match > 0) + { + //found 100% match + if (ret_match == str_ac_sz+1) + { + PRINT("Unknown state\n"); + break; + //partial match + } else + { + struct cmd_acq_t *acq = malloc(sizeof(struct cmd_acq_t)); + acq->suggestion = tbl[i].cmd; + SLIST_INSERT_HEAD(ac,acq,next_sugg); + } + } + i++; + } + + ret = ac; + + return ret; +} + +void cmd_acq_free( struct cmd_acq_head_t *acq ) +{ + struct cmd_acq_t *iter; + struct cmd_acq_t *prev; + + prev = NULL; + iter = NULL; + SLIST_FOREACH(iter,acq,next_sugg) + { + if ( prev != NULL ) + { + free( prev ); + prev = NULL; + } + prev = iter; + } + + return; +} + +char* cmd_mng_history( cmd_mng_t *cmng, int index ) +{ + int idx; + char *ret=NULL; + + if (cmng == NULL) + { + return NULL; + } + + if (cmng->history_size < CMD_HISTORY_SIZE) + { + if (index < cmng->history_size) + { + ret = cmng->history[index]; + } + } else + { + idx = (cmng->history_size-CMD_HISTORY_SIZE+index)%CMD_HISTORY_SIZE; + ret = cmng->history[idx]; + } + + return ret; +} + +char* cmd_mng_autocomplete( cmd_mng_t *cmng, char *cmd, size_t cmd_sz ) +{ + char *ret=NULL; + + cmd_arg_t *args; + cmd_tok_t tl, *ptr = &tl, *iter = NULL; + cmd_table_t *tab = cmng->table; + struct cmd_acq_t *iter_sugg = NULL; + int ac_sz=0,cnt_sz=0; + char *ac_str; + memset( &tl, 0, sizeof( cmd_tok_t )); + + if ( parse_cmd(ptr, cmd, cmd_sz) == -1) + { + printf("Cmd problems\n"); + return NULL; + } + + iter = ptr->next; + args = cmd_arg_create( iter ); + + //if command not found offer auto complete options + if (args->argc > 0) + { + struct cmd_acq_head_t *ac = cmd_acq(tab,args->argv[0]); + if (ac != NULL) + { + //calculate string str + SLIST_FOREACH(iter_sugg,ac,next_sugg) + { + //printf("%s ", iter_sugg->suggestion); + ac_sz += strlen(iter_sugg->suggestion)+1; //1 for " " + } + ac_sz += 2; //"> " + ac_sz += 1; //"\0" + + ac_str = (char *)malloc(ac_sz); + + memcpy( ac_str, "> ", 2 ); + cnt_sz = 2; + cnt_sz = 0; + SLIST_FOREACH(iter_sugg,ac,next_sugg) + { + //double logical usage + ac_sz = strlen(iter_sugg->suggestion); + memcpy( ac_str+cnt_sz, iter_sugg->suggestion, ac_sz); + cnt_sz += ac_sz; + ac_str[cnt_sz] = ' '; + cnt_sz += 1; + } + ac_str[cnt_sz] = '\0'; + ret = ac_str; + } + cmd_acq_free( ac ); + } + + cmd_tok_destroy( ptr->next ); + ptr->next = NULL; + cmd_arg_destroy( args ); + + return ret; +} + +int cmd_mng_exec( cmd_mng_t *cmng, const char *cmd, size_t sz_cmd ) +{ + int ret = CMD_EOK; + int fret = 0; + cmd_tok_t tl, *ptr_tl = &tl, *iter = NULL; + cmd_arg_t *args = NULL; + + // Init values + memset( &tl, 0, sizeof( cmd_tok_t )); + + fret = parse_cmd( ptr_tl, cmd, sz_cmd ); + if ( fret != 0 ) + { + ret = CMD_EEXE; + goto error_exe; //if err memleak from parse_cmd? + } + + iter = ptr_tl->next; + args = cmd_arg_create( iter ); + cmd_tok_destroy( ptr_tl->next ); + ptr_tl->next = NULL; + + if (cmd_exec(cmng->table, args) != 0) + { + ret = CMD_ECMD; + goto error_cmd; + } + + /* if history is on then manage commands */ + if (cmng->flag_history) + { + /*replace with proper datatype in future*/ + char *p = malloc(sz_cmd); + int idx = (cmng->history_size)%CMD_HISTORY_SIZE; + memcpy(p,cmd,sz_cmd); + if (cmng->history[idx]!=NULL) free(cmng->history[idx]); + cmng->history[idx] = p; + cmng->history_size += 1; //one day there could be overflow after 2^31/2^63 cmds, good luck with this bug + } + + cmd_arg_destroy( args ); + + return ret; +error_cmd: + cmd_arg_destroy( args ); + +error_exe: + + return ret; +} + +int cmd_mng_free( cmd_mng_t *cmng) +{ + int ret=0; + int i; + + for (i=0;i<CMD_HISTORY_SIZE;i++) + { + if (cmng->history[i]) + { + free(cmng->history[i]); + cmng->history[i] = NULL; + } + } + + return ret; +} + +/* +Clothest match function +AA AB = (1) equile <100% +AA AA = (3) equite 100% +AA AAA = (2) equile 100% but there is more +A B = (0) not equile at all +*/ +int strncmp_ac(const char *s1, const char *s2, const int n) +{ + int i=0; + + if (n<0) + { + printf("n<0 wrong argument value\n"); + return 0; + } + + /* not equile at all */ + /* A B */ + if ( s1[0] != s2[0] ) + { + return 0; + } + + i = 0; + while ( (s1[i] == s2[i]) && (i<n)) + { + i++; + } + + //printf("i"); + /* AA AA */ + if ( (s1[i]==0x00) && (s2[i]==0x0) && (i==n) ) + { + //printf("1 "); + return i+1; + /* AA AAA */ + } else if ( (s1[i]==0x0) && (s2[i]!=0x0) && (i==n) ) + { + //printf("2 "); + return i; + /* AAA AA */ + } else if ( (s1[i]!=0x0) && (s2[i]==0x0) && (i<n) ) + { + //printf("3 "); + return -i; + /* AA AB */ + } else if ( (s1[i]!=0x0) && (s2[i]!=0x0) && (s1[i]!=s2[i]) && (i<n) ) + { + //printf("4 "); + return -i; + } else + { + printf("Unknown condition\n"); + } + + return 0; +}
\ No newline at end of file diff --git a/cmd/cmd.h b/cmd/cmd.h new file mode 100644 index 0000000..a7ba143 --- /dev/null +++ b/cmd/cmd.h @@ -0,0 +1,174 @@ +#ifndef __CMD_H +#define __CMD_H + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdint.h> + +#include "debug.h" +#include "queue.h" + +#define CMDT_NONE 0 +#define CMDT_INT 1 +#define CMDT_HEX 2 +#define CMDT_BIN 3 +#define CMDT_QSTR 4 +#define CMDT_STR 5 +#define CMDT_WORD 6 +#define CMDT_SP 7 +#define CMDT_FLOAT 8 + +#define CMDE_NONE 0 //do nothing +#define CMDE_AUTOCOMPLETE 1 //try to auto complete first command +#define CMDE_ALIAS 2 //command aliases + +#define CMD_EOK 0 //all ok +#define CMD_EEXE 1 //command execution error +#define CMD_ECMD 2 //unknown command + +#define CMD_HISTORY_SIZE 16 //fixed size history + +/* +Arch + +[CLI]------->[PARSE] +[FILE]----/ + +[PARSE]-------->[[EXEC]->[HISTORY] other extra features] +[CMDLIST]----/ +*/ + +/* +Token list that comes from parser +*/ + +typedef struct cmd_tok_t +{ + char *s,*e; + int sz; + int type; + struct cmd_tok_t *next; +} cmd_tok_t; + +/* +Argument list passed to callback cmd functions +*/ + +typedef struct cmd_arg_t +{ + int argc; + char **argv; + int *type; + + /* bad practice stuff */ + int __sub_cmd; // if 1 then dont free argv stuff +} cmd_arg_t; + +/* +Table of defined commands +*/ + +typedef struct cmd_table_t +{ + char *cmd; + int (*clb)(cmd_arg_t*); //callback to command + int (*hlp)(cmd_arg_t*); //help command + int (*pre)(cmd_arg_t*); //preconditions for execution + int (*autocpl)(cmd_arg_t*); //autocomplete according to context +} cmd_table_t; + +/* +autocomplete suggestions from command list. Used for autcomplet "<TAB>" +*/ +struct cmd_acq_t +{ + char *suggestion; + SLIST_ENTRY(cmd_acq_t) next_sugg; +}; +SLIST_HEAD(cmd_acq_head_t,cmd_acq_t); + +/* +Contain all non cli parsing execution things. +Manage history and logging +Manage command loading from file +Manage autocomplete +*/ +typedef struct cmd_mng_t +{ + int flag_history; + /*simple que*/ + int history_size; + char *history[CMD_HISTORY_SIZE]; + + //not yet ready + //int flag_logging; + + // flag turn on/off autocomplete + int flag_autocomplete; + + cmd_table_t *table; +} cmd_mng_t; + +cmd_tok_t* cmd_tok_create( char *s, char *e, int sz, int type ); +int cmd_tok_add( cmd_tok_t *tok, cmd_tok_t *next ); +int cmd_tok_print( cmd_tok_t *tok ); +void cmd_tok_destroy( cmd_tok_t *tok ); //clean token by ->next token +int cmd_tok_count( cmd_tok_t *tok ); + +cmd_arg_t* cmd_arg_create( cmd_tok_t *tok ); +cmd_arg_t* cmd_arg_sub( cmd_arg_t *arg ); //just return without first arg +cmd_arg_t* cmd_arg_sub_empty(); +void cmd_arg_destroy( cmd_arg_t *arg ); + +int cmd_exec( cmd_table_t *tbl, cmd_arg_t *arg ); +int cmd_exec_ev( cmd_table_t *tbl, cmd_arg_t *arg, int event ); //auto complete and all other +char* cmd_ac( cmd_table_t *tbl, const char *s ); //autocomplete +struct cmd_acq_head_t* cmd_acq( cmd_table_t *tbl, const char *s ); //autocomplete +void cmd_acq_free( struct cmd_acq_head_t *acq ); + +/* +If history is on. +PARAM: + cmng - cli manager + index - index value in history +RETURN: + return non-NULL value if there something +*/ +char* cmd_mng_history( cmd_mng_t *cmng, int index ); + +/* +PARAM: + cmng + cmd - non complete command, not to execute, seach for suggestions +RETURN: + [FREE] return string list of autocomplete commands +*/ +char* cmd_mng_autocomplete( cmd_mng_t *cmng, char *cmd, size_t cmd_sz ); +/* +PARAM: + cmng + cmd - command to execute expect NULL at the end +RETURN: + return result of execution +*/ +int cmd_mng_exec( cmd_mng_t *cmng, const char *cmd, size_t sz_cmd ); +/* +Free resources that where givent to cmd manager, like history +*/ +int cmd_mng_free( cmd_mng_t *cmng); + + +#define STR_AC_EQ(A,B) (strncmp_ac((A),(B),strlen(A))==(strlen(A)+1)) +#define STR_AC_PEQ(A,B) (strncmp_ac((A),(B),strlen(A))<(strlen(A))) + +/* +Clothest match function +AA AB = (1) equile <100% +AA AA = (3) equite 100% +AA AAA = (2) equile 100% but there is more +A B = (0) not equile at all +*/ +int strncmp_ac( const char *s1, const char *s2, const int n); + +#endif
\ No newline at end of file diff --git a/cmd/cmd.swift b/cmd/cmd.swift new file mode 100644 index 0000000..ec1ca44 --- /dev/null +++ b/cmd/cmd.swift @@ -0,0 +1,78 @@ +// +// cmd.swift +// cmd +// +// Created by Jacky Jack on 12/06/2023. +// + +import Foundation + +public class CmdToken { + public var type:Int = 0 + public var val="" + init(type: Int, val: String = "") { + self.type = type + self.val = val + } +} + + +public class CmdParser { + + public init() {} + + public func parse() { + var tok:cmd_tok_t = cmd_tok_t() + //var pointer = UnsafeMutablePointer(&tok) + var c="hello 123 0x0" + parse_cmd(&tok, c, c.count) + + + var iter = tok + while (iter.next != nil) { + iter = iter.next.pointee + //print("\(iter.type) \(iter.s) \(iter.e) \(iter.next) \(iter.sz)") + } + } + + public func parse(_ cmd: String) -> Array<CmdToken> { + var token_list = Array<CmdToken>() + var tok:cmd_tok_t = cmd_tok_t() + parse_cmd(&tok, cmd, cmd.count ) + + var iter = tok + var start_str = UnsafeRawPointer(cmd) + //print("cmd \(start_str)") + while (iter.next != nil) { + iter = iter.next.pointee + //print("\(iter.type) \(iter.s) \(iter.e) \(iter.next) \(iter.sz)") + if let start = iter.s { + //print("yes") + } else { + //print("Cant unwrap") + } + let addr_s = UnsafeRawPointer(&iter.s.pointee) + let addr_e = UnsafeRawPointer(&iter.e.pointee) + //let addr_len = addr_e - addr_s + //print("s \(addr_s) e \(addr_e)") + + //let length = iter.e - iter.s + + let sub_st = cmd.index(cmd.startIndex, offsetBy: addr_s - start_str ) + let sub_en = cmd.index(cmd.startIndex, offsetBy: addr_e - start_str ) + let subs = cmd[sub_st..<sub_en] + token_list.append(CmdToken(type: Int(iter.type), val: String(subs))) + } + + + return token_list + } +} +/* +public func parse() { + var tok:cmd_tok_t = cmd_tok_t() + var c="asd 123" + parse_cmd(&tok, c, c.count) + +}*/ + diff --git a/cmd/cmd_parse.c b/cmd/cmd_parse.c new file mode 100644 index 0000000..9d831cf --- /dev/null +++ b/cmd/cmd_parse.c @@ -0,0 +1,328 @@ + +#line 1 "cmd_parse.ragel" +#include "cmd_parse.h" + +//#define CTS(X) {if (!dm_current_tok)token_s = p; printf("%s ",#X);if (!dm_current_tok) dm_current_tok = TOK_##X;} +//#define CTE() {token_e = p;} +#define TADD(T,S,E,SZ) {cmd_tok_t *t=cmd_tok_create(S,E,SZ,T);cmd_tok_add(tl,t);tl=tl->next;} +//#define TADD(T,S,E) + +//#define PR_TK_DBG(S) printf(S);fwrite(ts,1,te-ts,stdout);printf("\n"); +#define PR_TK_DBG(S) ; + +char *new_string( const char *start, const char *end ) +{ + int str_s = end-start+1; + char *new_str=malloc( str_s+1 ); + memcpy( new_str, start, str_s ); + if ( new_str != NULL ) + new_str[str_s]=0x0; + return new_str; +} + +int print_token( char *s, char *e, int tok) +{ + char *p = new_string( s, e ); + printf("t=%d,p=%s\n",tok,p); + free( p ); + return 0; +} + + + +#line 34 "cmd_parse.c" +static const char _cmd_actions[] = { + 0, 1, 0, 1, 1, 1, 6, 1, + 7, 1, 8, 1, 9, 1, 10, 2, + 2, 3, 2, 2, 4, 2, 2, 5 + +}; + +static const char _cmd_key_offsets[] = { + 0, 0, 3, 6, 18, 21, 28, 38, + 46, 53 +}; + +static const char _cmd_trans_keys[] = { + 34, 39, 92, 32, 34, 92, 32, 34, + 46, 48, 9, 10, 33, 47, 49, 57, + 58, 126, 33, 35, 126, 33, 35, 47, + 48, 57, 58, 126, 33, 46, 98, 120, + 35, 47, 48, 57, 58, 126, 33, 46, + 35, 47, 48, 57, 58, 126, 33, 35, + 47, 48, 49, 50, 126, 33, 35, 47, + 48, 57, 58, 64, 65, 70, 71, 96, + 97, 102, 103, 126, 0 +}; + +static const char _cmd_single_lengths[] = { + 0, 3, 3, 4, 1, 1, 4, 2, + 1, 1 +}; + +static const char _cmd_range_lengths[] = { + 0, 0, 0, 4, 1, 3, 3, 3, + 3, 7 +}; + +static const char _cmd_index_offsets[] = { + 0, 0, 4, 8, 17, 20, 25, 33, + 39, 44 +}; + +static const char _cmd_indicies[] = { + 1, 2, 3, 0, 0, 0, 0, 2, + 4, 0, 6, 7, 4, 5, 8, 5, + 2, 5, 5, 9, 5, 5, 6, 5, + 9, 5, 6, 11, 12, 5, 8, 5, + 10, 5, 6, 5, 8, 5, 10, 5, + 5, 14, 5, 13, 5, 5, 15, 5, + 15, 5, 15, 5, 13, 0 +}; + +static const char _cmd_trans_targs[] = { + 1, 3, 0, 2, 3, 4, 5, 6, + 7, 3, 3, 8, 9, 3, 8, 9 +}; + +static const char _cmd_trans_actions[] = { + 0, 5, 0, 0, 7, 0, 0, 0, + 0, 11, 9, 21, 21, 13, 18, 15 +}; + +static const char _cmd_to_state_actions[] = { + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0 +}; + +static const char _cmd_from_state_actions[] = { + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0 +}; + +static const char _cmd_eof_trans[] = { + 0, 0, 0, 0, 10, 10, 11, 11, + 14, 14 +}; + +static const int cmd_start = 3; +static const int cmd_first_final = 3; +static const int cmd_error = 0; + +static const int cmd_en_main = 3; + + +#line 62 "cmd_parse.ragel" + + +int parse_cmd( cmd_tok_t *tl, const char *str, size_t str_size ) +{ + static uint8_t cs; + const int stacksize = 10; + int res=0, *stack=NULL, act=0,top=0; + stack = malloc( sizeof(stack)*stacksize ); + char *p=(char *)str, *pe = (char *)str + str_size, *eof=pe; + char *ts, *te = 0; + + /*save for cmd_begin state*/ + //char *ts_cb=0, *te_cb=0; + + //printf("PE:%s %02x\n",pe,(unsigned char)*pe); + + /* + variables used in state machine + */ + + +#line 138 "cmd_parse.c" + { + cs = cmd_start; + ts = 0; + te = 0; + act = 0; + } + +#line 83 "cmd_parse.ragel" + +#line 148 "cmd_parse.c" + { + int _klen; + unsigned int _trans; + const char *_acts; + unsigned int _nacts; + const char *_keys; + + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _acts = _cmd_actions + _cmd_from_state_actions[cs]; + _nacts = (unsigned int) *_acts++; + while ( _nacts-- > 0 ) { + switch ( *_acts++ ) { + case 1: +#line 1 "NONE" + {ts = p;} + break; +#line 169 "cmd_parse.c" + } + } + + _keys = _cmd_trans_keys + _cmd_key_offsets[cs]; + _trans = _cmd_index_offsets[cs]; + + _klen = _cmd_single_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower = _keys; + const char *_mid; + const char *_upper = _keys + _klen - 1; + while (1) { + if ( _upper < _lower ) + break; + + _mid = _lower + ((_upper-_lower) >> 1); + if ( (*p) < *_mid ) + _upper = _mid - 1; + else if ( (*p) > *_mid ) + _lower = _mid + 1; + else { + _trans += (unsigned int)(_mid - _keys); + goto _match; + } + } + _keys += _klen; + _trans += _klen; + } + + _klen = _cmd_range_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower = _keys; + const char *_mid; + const char *_upper = _keys + (_klen<<1) - 2; + while (1) { + if ( _upper < _lower ) + break; + + _mid = _lower + (((_upper-_lower) >> 1) & ~1); + if ( (*p) < _mid[0] ) + _upper = _mid - 2; + else if ( (*p) > _mid[1] ) + _lower = _mid + 2; + else { + _trans += (unsigned int)((_mid - _keys)>>1); + goto _match; + } + } + _trans += _klen; + } + +_match: + _trans = _cmd_indicies[_trans]; +_eof_trans: + cs = _cmd_trans_targs[_trans]; + + if ( _cmd_trans_actions[_trans] == 0 ) + goto _again; + + _acts = _cmd_actions + _cmd_trans_actions[_trans]; + _nacts = (unsigned int) *_acts++; + while ( _nacts-- > 0 ) + { + switch ( *_acts++ ) + { + case 2: +#line 1 "NONE" + {te = p+1;} + break; + case 3: +#line 52 "cmd_parse.ragel" + {act = 1;} + break; + case 4: +#line 54 "cmd_parse.ragel" + {act = 3;} + break; + case 5: +#line 56 "cmd_parse.ragel" + {act = 5;} + break; + case 6: +#line 55 "cmd_parse.ragel" + {te = p+1;{PR_TK_DBG("qstr = ");TADD(CMDT_QSTR, ts,te,te-ts);}} + break; + case 7: +#line 57 "cmd_parse.ragel" + {te = p+1;{PR_TK_DBG("sp = ");/*TADD(CMDT_SP, ts,te,te-ts);*/}} + break; + case 8: +#line 53 "cmd_parse.ragel" + {te = p;p--;{PR_TK_DBG("dec = ");TADD(CMDT_INT, ts,te,te-ts);}} + break; + case 9: +#line 56 "cmd_parse.ragel" + {te = p;p--;{PR_TK_DBG("word = ");TADD(CMDT_WORD, ts,te,te-ts);}} + break; + case 10: +#line 1 "NONE" + { switch( act ) { + case 1: + {{p = ((te))-1;}PR_TK_DBG("hex = ");TADD(CMDT_HEX, ts,te,te-ts);} + break; + case 3: + {{p = ((te))-1;}PR_TK_DBG("bin = ");TADD(CMDT_BIN, ts,te,te-ts);} + break; + case 5: + {{p = ((te))-1;}PR_TK_DBG("word = ");TADD(CMDT_WORD, ts,te,te-ts);} + break; + } + } + break; +#line 282 "cmd_parse.c" + } + } + +_again: + _acts = _cmd_actions + _cmd_to_state_actions[cs]; + _nacts = (unsigned int) *_acts++; + while ( _nacts-- > 0 ) { + switch ( *_acts++ ) { + case 0: +#line 1 "NONE" + {ts = 0;} + break; +#line 295 "cmd_parse.c" + } + } + + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + if ( p == eof ) + { + if ( _cmd_eof_trans[cs] > 0 ) { + _trans = _cmd_eof_trans[cs] - 1; + goto _eof_trans; + } + } + + _out: {} + } + +#line 84 "cmd_parse.ragel" + + if ( cs == cmd_error ) + { + printf("CLIPARSE ERR state [%d] pos[%ld]:[%s]\n", res, p-str, p); + res = -1; + } + + free( stack ); + + return res; +} + + + diff --git a/cmd/cmd_parse.h b/cmd/cmd_parse.h new file mode 100644 index 0000000..079f605 --- /dev/null +++ b/cmd/cmd_parse.h @@ -0,0 +1,8 @@ +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> + +#include "cmd.h" + +int parse_cmd( cmd_tok_t *tl, const char *str, size_t str_size ); diff --git a/cmd/debug.h b/cmd/debug.h new file mode 100644 index 0000000..a8bf211 --- /dev/null +++ b/cmd/debug.h @@ -0,0 +1,69 @@ +#ifndef __RB_DEBUG_UTILS_H +#define __RB_DEBUG_UTILS_H + +//what about kprintf? + +//config options +#define PRINTF printf +#define COLORIZE +#define PRINT_LINENUM +#define PRINT_FILENAME +#define PRINT_DEBUG + + +//use color +#ifdef COLORIZE + #define D_COLOR "1;32m |