Diff: TokensHandling.cpp

Revision:

1:4fd32c2e7975

Parent:

0:befccd954577

--- a/TokensHandling.cpp	Tue Jun 09 10:21:57 2020 +0000
+++ b/TokensHandling.cpp	Tue Jun 09 11:20:57 2020 +0000
@@ -17,12 +17,11 @@
     {STEP,  "step"},
 };
 
-void TokensHandler::ReplaceCharactersInString(char *pcString,char cOldChar,char cNewChar){
-        char *CurrentChar = strchr(pcString,cOldChar);
-        while(*CurrentChar){
-            *CurrentChar = cNewChar;
-            CurrentChar = strchr(CurrentChar,cOldChar);
-        }
+void TokensHandler::ReplaceCharactersInString(char pcString[],char cOldChar,char cNewChar){
+    char *pString = pcString;
+    while((pString = strchr(pString,cOldChar)) != NULL){
+        *pString++ = cNewChar;
+    }
 }  
 
 
@@ -61,15 +60,14 @@
 
     for(ucTokenCounter= 0; ucTokenCounter< ucTokenNr; ucTokenCounter++){
         psCurrentToken= &asToken[ucTokenCounter];
-    
-        if(sscanf(asToken[ucTokenCounter].uValue.pcString, "%x", &uiTokenValue) == 1 ){
+        if(OK== eStringToKeyword(psCurrentToken->uValue.pcString, &eTokenCode)){
+            psCurrentToken->eType=KEYWORD;
+            psCurrentToken->uValue.eKeyword=eTokenCode;
+        }
+        else if(sscanf(asToken[ucTokenCounter].uValue.pcString, "%x", &uiTokenValue) == 1 ){
             psCurrentToken->eType= NUMBER;
             psCurrentToken->uValue.uiNumber= uiTokenValue;
         }
-        else if(OK== eStringToKeyword(psCurrentToken->uValue.pcString, &eTokenCode)){
-            psCurrentToken->eType=KEYWORD;
-            psCurrentToken->uValue.eKeyword=eTokenCode;
-        }
         else{
             psCurrentToken->eType=STRING;
         }