Updated the argument parser, /K/M arguments did not work correctly if…

… last in a line with regular arguments.
cnvogelg · Apr 20, 2017 · c722b20 · c722b20
1 parent fdc4d32
commit c722b20
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/amitools/vamos/lib/DosLibrary.py b/amitools/vamos/lib/DosLibrary.py
@@ -629,7 +629,7 @@ def FPuts(self, ctx):
     # write to stdout
     fh = self.file_mgr.get_by_b_addr(fh_b_addr,True)
     ok = fh.write(str_dat)
-    log_dos.info("FPuts(%s,'%s')", (fh, str_dat))
+    log_dos.info("FPuts(%s,'%s')" % (fh, str_dat))
     return 0 # ok
 
   def UnGetC(self, ctx):

diff --git a/amitools/vamos/lib/UtilityLibrary.py b/amitools/vamos/lib/UtilityLibrary.py
@@ -45,6 +45,7 @@ def Stricmp(self, ctx):
     str2_addr = ctx.cpu.r_reg(REG_A1)
     str1 = ctx.mem.access.r_cstr(str1_addr)
     str2 = ctx.mem.access.r_cstr(str2_addr)
+    log_utility.info("Stricmp(%08x=\"%s\",%08x=\"%s\")" % (str1_addr,str1,str2_addr,str2))
     if str1.lower() < str2.lower():
       return -1
     elif str1.lower() > str2.lower():
@@ -58,6 +59,7 @@ def Strnicmp(self, ctx):
     length    = ctx.cpu.r_reg(REG_D0)
     str1 = ctx.mem.access.r_cstr(str1_addr)[:length]
     str2 = ctx.mem.access.r_cstr(str2_addr)[:length]
+    log_utility.info("Strnicmp(%08x=\"%s\",%08x=\"%s\")" % (str1_addr,str1,str2_addr,str2))
     if str1.lower() < str2.lower():
       return -1
     elif str1.lower() > str2.lower():

diff --git a/amitools/vamos/lib/dos/Args.py b/amitools/vamos/lib/dos/Args.py
@@ -176,7 +176,7 @@ def parse_string(self, in_args):
           return False
 
       # keyword
-      elif targ['k']:
+      elif targ['k'] and not targ['m']:
         val = self._find_remove_key(targ['keys'], args, True)
         # keyword at end of line
         if val == None:
@@ -246,9 +246,12 @@ def parse_string(self, in_args):
         if targ['a'] and len(result[pos])==0:
           self.error = ERROR_REQUIRED_ARG_MISSING
           return False
+      pos = pos + 1
 
-      # normal entry
-      elif targ['x']:
+    pos = 0
+    for targ in targs:
+      # normal entry that is not yet filled
+      if targ['x'] and result[pos] == None:
         # take from arraay
         if len(args)>0:
           val = self.unquote(args[0])