Added a dedicated function to the tokenizer for getting string literals.
This commit is contained in:
+6
-6
@@ -81,14 +81,14 @@ Token* GetNextToken(char *string) {
|
|||||||
if (IsOpcode(string_token)) return CreateToken(TK_Opcode, string_token);
|
if (IsOpcode(string_token)) return CreateToken(TK_Opcode, string_token);
|
||||||
if (IsRegister(string_token)) return CreateToken(TK_Register, string_token);
|
if (IsRegister(string_token)) return CreateToken(TK_Register, string_token);
|
||||||
|
|
||||||
char* next = SplitOnBasicGrammar(NULL);
|
// char* next = SplitOnBasicGrammar(NULL);
|
||||||
|
|
||||||
if (next && strcmp(next, ":") == 0) {
|
// if (next && strcmp(next, ":") == 0) {
|
||||||
free(next);
|
// free(next);
|
||||||
return CreateToken(TK_Label, string_token);
|
// return CreateToken(TK_Label, string_token);
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (next) free(next);
|
// if (next) free(next);
|
||||||
|
|
||||||
return CreateToken(TK_String, string_token);
|
return CreateToken(TK_String, string_token);
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-15
@@ -1,4 +1,8 @@
|
|||||||
#include "../includes/tokenizer.h"
|
#include "../includes/tokenizer.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
void GetStringLiteral(char*, unsigned long, char**, unsigned long*);
|
||||||
|
|
||||||
char* SplitOnBasicGrammar(char* line) {
|
char* SplitOnBasicGrammar(char* line) {
|
||||||
static char* string;
|
static char* string;
|
||||||
@@ -9,20 +13,12 @@ char* SplitOnBasicGrammar(char* line) {
|
|||||||
position = 0;
|
position = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* token = calloc(1, strlen(string) + 1);
|
unsigned long length = strlen(string);
|
||||||
int parsing_string = 0;
|
char* token = calloc(1, length + 1);
|
||||||
|
//int parsing_string = 0;
|
||||||
|
|
||||||
for (int i = 0; position < strlen(string); i++, position++) {
|
for (int i = 0; position < length; i++, position++) {
|
||||||
|
|
||||||
if (parsing_string) {
|
|
||||||
if (string[position] == '\n') break;
|
|
||||||
if (string[position] == '"') break;
|
|
||||||
|
|
||||||
token[i] = string[position];
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string[position] == ';') break;
|
if (string[position] == ';') break;
|
||||||
|
|
||||||
if (string[position] == ':') {
|
if (string[position] == ':') {
|
||||||
@@ -35,9 +31,9 @@ char* SplitOnBasicGrammar(char* line) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (string[position] == '"') {
|
if (string[position] == '"') {
|
||||||
parsing_string = 1;
|
position++;
|
||||||
i--;
|
GetStringLiteral(string, length, &token, &position);
|
||||||
continue;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string[position] == ' ') {
|
if (string[position] == ' ') {
|
||||||
@@ -63,6 +59,20 @@ char* SplitOnBasicGrammar(char* line) {
|
|||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetStringLiteral(char* text, unsigned long length, char** token, unsigned long* position) {
|
||||||
|
if (!text) return;
|
||||||
|
if (!token) return;
|
||||||
|
|
||||||
|
for(int i = 0; *position < length; (*position)++, i++) {
|
||||||
|
if (text[*position] == '"') {
|
||||||
|
(*position)++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
(*token)[i] = text[*position];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// TokenType GetOperatorType(char c) {
|
// TokenType GetOperatorType(char c) {
|
||||||
// switch (c){
|
// switch (c){
|
||||||
// case '+':
|
// case '+':
|
||||||
|
|||||||
Reference in New Issue
Block a user