Browse Source

fcl-passrc: improvement for Amiga, OS4, MorphOS syscalls

git-svn-id: trunk@48909 -
(cherry picked from commit e668f8732a85e5a40c318fce70eba53fcbb99458)
marcus 4 years ago
parent
commit
a487401c7b
1 changed files with 6 additions and 2 deletions
  1. 6 2
      packages/fcl-passrc/src/pparser.pp

+ 6 - 2
packages/fcl-passrc/src/pparser.pp

@@ -5495,8 +5495,12 @@ begin
         else
           // remove legacy or basesysv on MorphOS syscalls
           begin
-          if CurTokenIsIdentifier('legacy') or CurTokenIsIdentifier('consoledevice')
-             or (Curtoken=tkIdentifier) and (Pos('base',LowerCase(CurtokenText))>0) then
+          if (Pos('sysv',LowerCase(CurtokenText))>0) or CurTokenIsIdentifier('legacy') then
+            NextToken; 
+          // remove LibBase (Amiga, AROS, MorphOS)  or Interface (OS4)
+          if CurTokenIsIdentifier('consoledevice') or
+              ((Curtoken=tkIdentifier) and (Pos('base',LowerCase(CurtokenText)) > 0)) or 
+              ((Curtoken=tkIdentifier) and (CurtokenText[1] = 'I')) then
             NextToken;
           end;
       end;