strupr is a Microsoft C function; replaced with custom strupr to avoi…

…d errors on Linux.
linguini1 · Jul 10, 2023 · ac440a9 · ac440a9
1 parent 4585f39
commit ac440a9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/assembler/src/conversion/lexer.c b/assembler/src/conversion/lexer.c
@@ -101,13 +101,13 @@ Token *lexer_next_token(Lexer *lexer) {
 
  if (is_operator(identifier)) {
  ident_type = TokenOperator;
- strupr(identifier);
+ string_to_uppercase(identifier);
  } else if (is_register(identifier)) {
  ident_type = TokenRegister;
- strupr(identifier);
+ string_to_uppercase(identifier);
  } else if (is_special_register(identifier)) {
  ident_type = TokenSpecialRegister;
- strupr(identifier);
+ string_to_uppercase(identifier);
  }
  return token_construct(identifier, ident_type, lexer->line, lexer->col);
  }
@@ -276,7 +276,7 @@ static char *_struprcpy(char *ident) {
  size_t length = strlen(ident);
  char *upr_ident = malloc(length + 1);
  strcpy(upr_ident, ident);
- strupr(upr_ident);
+ string_to_uppercase(upr_ident);
  return upr_ident;
 }
 
@@ -318,7 +318,7 @@ static bool is_operator(char *ident) {
  size_t length = strlen(ident);
  char *upr_ident = malloc(length + 1);
  strcpy(upr_ident, ident);
- strupr(upr_ident);
+ string_to_uppercase(upr_ident);
 
  if (length == 0) {
  free(upr_ident);

diff --git a/assembler/src/conversion/tokens.c b/assembler/src/conversion/tokens.c
@@ -1,4 +1,5 @@
 #include "tokens.h"
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -103,8 +104,15 @@ Token *token_list_get(TokenList *list, int index) {
  return list->tokens[index];
 }
 
-/* Operator classifcation */
+/* Utility functions */
+void string_to_uppercase(char *string) {
+ while (*string) {
+ *string = toupper(*string);
+ string++;
+ }
+}
 
+/* Operator classification */
 bool is_conditional(char *ident) {
 
  if (ident == NULL) {
@@ -115,7 +123,7 @@ bool is_conditional(char *ident) {
  size_t length = strlen(ident);
  char *upr_ident = malloc(length + 1);
  strcpy(upr_ident, ident);
- strupr(upr_ident);
+ string_to_uppercase(upr_ident);
 
  if (length == 0) {
  free(upr_ident);

diff --git a/assembler/src/conversion/tokens.h b/assembler/src/conversion/tokens.h
@@ -61,6 +61,9 @@ void token_list_destruct(TokenList *list);
 void token_list_append(TokenList *list, Token *token);
 Token *token_list_get(TokenList *list, int index);
 
+/* Utility functions */
+void string_to_uppercase(char *string);
+
 /* Operator classification */
 bool is_conditional(char *ident);
 unsigned int _condition_code(char *cc);