aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Remaining parser function unicode compatible

Browse Source
This commit is contained in:
James Booth 2013-07-14 01:00:11 +01:00
parent e7478d8cb8
commit 7f82dc42f5
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/tools/parser.c
View File

@ -297,34 +297,27 @@ parse_args_with_freetext(const char * const inp, int min, int max)
int int
count_tokens(char *string) count_tokens(char *string)
{ {
int length = g_utf8_strlen(string, -1);
gboolean in_quotes = FALSE;
int num_tokens = 0; int num_tokens = 0;
int i = 0;
// if no quotes, use glib // include first token
if (g_strrstr(string, "\"") == NULL) { num_tokens++;
gchar **tokens = g_strsplit(string, " ", 0);
num_tokens = g_strv_length(tokens);
g_strfreev(tokens);
// else count tokens including quoted for (i = 0; i < length; i++) {
} else { gchar *curr_ch = g_utf8_offset_to_pointer(string, i);
int length = strlen(string); gunichar curr_uni = g_utf8_get_char(curr_ch);
int i = 0;
gboolean in_quotes = FALSE;
// include first token if (curr_uni == ' ') {
num_tokens++; if (!in_quotes) {
num_tokens++;
for (i = 0; i < length; i++) { }
if (string[i] == ' ') { } else if (curr_uni == '"') {
if (!in_quotes) { if (in_quotes) {
num_tokens++; in_quotes = FALSE;
} } else {
} else if (string[i] == '"') { in_quotes = TRUE;
if (in_quotes) {
in_quotes = FALSE;
} else {
in_quotes = TRUE;
}
} }
} }
} }
@ -335,25 +328,31 @@ count_tokens(char *string)
char * char *
get_start(char *string, int tokens) get_start(char *string, int tokens)
{ {
GString *result = g_string_new("");
int length = g_utf8_strlen(string, -1);
gboolean in_quotes = FALSE;
char *result_str = NULL; char *result_str = NULL;
int num_tokens = 0; int num_tokens = 0;
int length = strlen(string);
int i = 0; int i = 0;
gboolean in_quotes = FALSE;
GString *result = g_string_new("");
// include first token // include first token
num_tokens++; num_tokens++;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
gchar *curr_ch = g_utf8_offset_to_pointer(string, i);
gunichar curr_uni = g_utf8_get_char(curr_ch);
if (num_tokens < tokens) { if (num_tokens < tokens) {
g_string_append_c(result, string[i]); gchar *uni_char = malloc(7);
int len = g_unichar_to_utf8(curr_uni, uni_char);
uni_char[len] = '\0';
g_string_append(result, uni_char);
} }
if (string[i] == ' ') { if (curr_uni == ' ') {
if (!in_quotes) { if (!in_quotes) {
num_tokens++; num_tokens++;
} }
} else if (string[i] == '"') { } else if (curr_uni == '"') {
if (in_quotes) { if (in_quotes) {
in_quotes = FALSE; in_quotes = FALSE;
} else { } else {