WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/oberon07/Source/ Rev 7106 and /programs/develop/oberon07/Source/ Rev 7107

Regard whitespace Rev 7106 → Rev 7107

 /programs/develop/oberon07/Source/Compiler.ob07
 ,5 → 1,5
 (*
-    Copyright 2016 Anton Krotov
+    Copyright 2016, 2017 Anton Krotov
     This file is part of Compiler.
 ,10 → 52,10
   stABS = 1; stODD = 2; stLEN = 3; stLSL = 4; stASR = 5; stROR = 6; stFLOOR = 7; stFLT = 8;
   stORD = 9; stCHR = 10; stLONG = 11; stSHORT = 12; stINC = 13; stDEC = 14; stINCL = 15;
   stEXCL = 16; stCOPY = 17; stNEW = 18; stASSERT = 19; stPACK = 20; stUNPK = 21; stDISPOSE = 22;
-  stBITS = 23; stLSR = 24; stLENGTH = 25;
+  stBITS = 23; stLSR = 24; stLENGTH = 25; stMIN = 26; stMAX = 27;
   sysADR = 101; sysSIZE = 102; sysINF = 103; sysGET = 104; sysPUT = 105;
-  sysCODE = 106; sysTYPEID = 107; sysMOVE = 108;
+  sysCODE = 106; sysTYPEID = 107; sysMOVE = 108; sysCOPY = 109;
 TYPE
 ,7 → 394,9
       IntType(b.T, coord);
       IF b.eType = eCONST THEN
         Assert(ASR(FLOOR(b.Value), 5) = 0, coord, 53);
+        IF a.eType = eCONST THEN
         Assert(a.Value <= b.Value, coord, 54)
+        END
       END;
       Load(b)
     ELSE
 ,6 → 617,32
     Str(e1);
     e.T := inttype;
     X86.StFunc(X86.stLENGTH)
+  |stMIN, stMAX:
+    pExpr(e1);
+    IntType(e1.T, coord);
+    Load(e1);
+    Check(lxComma);
+    NextCoord(coord);
+    pExpr(e2);
+    IntType(e2.T, coord);
+    Load(e2);
+    IF (e1.eType = eCONST) & (e2.eType = eCONST) THEN
+      a := FLOOR(e1.Value);
+      b := FLOOR(e2.Value);
+      CASE func OF
+      |stMIN: a := MIN(a, b)
+      |stMAX: a := MAX(a, b)
+      ELSE
+      END;
+      e.Value := LONG(FLT(a));
+      e.eType := eCONST
+    END;
+    IF func = stMIN THEN
+      X86.StFunc(X86.stMIN)
+    ELSE
+      X86.StFunc(X86.stMAX)
+    END;
+    e.T := inttype
   |sysADR:
     Assert((SCAN.tLex = lxIDENT) OR (SCAN.tLex = lxSTRING) OR (SCAN.tLex = lxCHX), coord, 43);
     IF SCAN.tLex = lxIDENT THEN
 ,12 → 1664,29
     Expr(e1);
     IntType(e1.T, coord);
     Load(e1);
+  |sysCOPY:
+    begcall := X86.current;
+    Designator(e1);
+    Assert(e1.eType = eVAR, coord, 63);
+    Check(lxComma);
+    X86.PushCall(begcall);
+    X86.Param;
+    NextCoord(coord);
+    Designator(e1);
+    Assert(e1.eType = eVAR, coord, 63);
+    Assert(~e1.Read, coord, 115);
+    Check(lxComma);
+    X86.EndCall;
+    NextCoord(coord);
+    Expr(e1);
+    IntType(e1.T, coord);
+    Load(e1);
   ELSE
     Assert(FALSE, coord2, 132)
   END;
   Check(lxRRound);
   Next;
-  IF proc = sysMOVE THEN
+  IF (proc = sysMOVE) OR (proc = sysCOPY) THEN
     X86.StProc(X86.sysMOVE)
   END
 END StProc;
 ,7 → 1723,7
       IF s.Len = 1 THEN
         X86.Mono(s.Number)
       END;
-      X86.PushConst(UTILS.min(s.Len + 1, e1.T.Len))
+      X86.PushConst(MIN(s.Len + 1, e1.T.Len))
     END;
     X86.Save(e1.T.tType)
   ELSIF e1.eType = ePROC THEN

 /programs/develop/oberon07/Source/DECL.ob07
 ,5 → 1,5
 (*
-    Copyright 2016 Anton Krotov
+    Copyright 2016, 2017 Anton Krotov
     This file is part of Compiler.
 ,10 → 43,10
   stABS = 1; stODD = 2; stLEN = 3; stLSL = 4; stASR = 5; stROR = 6; stFLOOR = 7; stFLT = 8;
   stORD = 9; stCHR = 10; stLONG = 11; stSHORT = 12; stINC = 13; stDEC = 14; stINCL = 15;
   stEXCL = 16; stCOPY = 17; stNEW = 18; stASSERT = 19; stPACK = 20; stUNPK = 21; stDISPOSE = 22;
-  stBITS = 23; stLSR = 24; stLENGTH = 25;
+  stBITS = 23; stLSR = 24; stLENGTH = 25; stMIN = 26; stMAX = 27;
   sysADR = 101; sysSIZE = 102; sysINF = 103; sysGET = 104; sysPUT = 105;
-  sysCODE = 106; sysTYPEID = 107; sysMOVE = 108;
+  sysCODE = 106; sysTYPEID = 107; sysMOVE = 108; sysCOPY = 109;
   TINTEGER = 1; TREAL = 2; TLONGREAL = 3; TCHAR = 4; TSET = 5; TBOOLEAN = 6; TVOID = 7; TNIL = 8;
   TCARD16 = 9; TSTRING = 10; TARRAY = 11; TRECORD = 12; TPOINTER = 13; TPROC = 14;
 ,6 → 417,8
   PushStProc("BITS",     stBITS);
   PushStProc("LSR",      stLSR);
   PushStProc("LENGTH",   stLENGTH);
+  PushStProc("MIN",      stMIN);
+  PushStProc("MAX",      stMAX);
   Guard
 END StIdent;
 ,6 → 1056,9
       Check(lxIDENT);
       nov.Base := IdType(coord);
       Assert(nov.Base # NIL, coord, 42);
+      IF (nov.Base.tType = TPOINTER) & (nov.Base.Base.tType = TRECORD) THEN
+          nov.Base := nov.Base.Base
+      END;
       Assert(nov.Base.tType = TRECORD, coord, 80);
       Assert(notrecurs(TRUE, nov.Base), coord, 96);
       nov.Size := nov.Base.Size;
 ,10 → 1199,16
       last := unit.Idents.Last(IDENT);
       Check(lxEQ);
       Next;
+      IF SCAN.tLex = lxIDENT THEN
+        last.T := ParseType(coord)
+      ELSE
       NEW(NewType);
       MemErr(NewType = NIL);
       last.T := NewType;
-      T := StructType(FALSE, NewType);
+        T := StructType(FALSE, NewType)
+      END;
       Check(lxSemi);
       Next
     END
 ,6 → 1427,7
   PushSysProc("PUT",     sysPUT);
   PushSysProc("CODE",    sysCODE);
   PushSysProc("MOVE",    sysMOVE);
+  PushSysProc("COPY",    sysCOPY);
   PushSysProc("INF",     sysINF);
   PushSysType("CARD16",  TCARD16);
   sys := unit;

 /programs/develop/oberon07/Source/ERRORS.ob07
 ,5 → 1,5
 (*
-    Copyright 2016 Anton Krotov
+    Copyright 2016, 2017 Anton Krotov
     This file is part of Compiler.
 ,7 → 200,7
   | 77: str := "®¦¨¤ «áï ¨¤¥â¨ä¨ª â®à â¨¯ "
   | 78: str := "¤«¨  â¨¯ -¬ áá¨¢  ¤®«¦  ¡ëâì ¡®«ìè¥ ã«ï"
   | 79: str := "®¦¨¤ «®áì 'OF' ¨«¨ ','"
-  | 80: str := "®¦¨¤ «áï ¨¤¥â¨ä¨ª â®à â¨¯ -§ ¯¨á¨"
+  | 80: str := "®¦¨¤ «áï ¨¤¥â¨ä¨ª â®à â¨¯ -§ ¯¨á¨ ¨«¨ â¨¯ -ãª § â¥«ï"
   | 81: str := "¡ §®¢ë© â¨¯ â¨¯ -ãª § â¥«ï ¤®«¦¥ ¡ëâì § ¯¨áìî"
   | 82: str := "â¨¯ à¥§ã«ìâ â  ¯à®æ¥¤ãàë ¥ ¬®¦¥â ¡ëâì § ¯¨áìî ¨«¨ ¬ áá¨¢®¬"
   | 83: str := "à §¬¥à â¨¯  á«¨èª®¬ ¢¥«¨ª"

 /programs/develop/oberon07/Source/UTILS.ob07
 ,5 → 1,5
 (*
-    Copyright 2016 Anton Krotov
+    Copyright 2016, 2017 Anton Krotov
     This file is part of Compiler.
 ,7 → 28,7
   Ext* = ".ob07";
   MAX_PATH = 1024;
   MAX_PARAM = 1024;
-  Date* = 1451606400; (* 2016-01-01 *)
+  Date* = 1509580800;  (* 2017-11-02 *)
 TYPE
 ,14 → 199,6
   Line := newLine
 END UnitLine;
-PROCEDURE min*(a, b: INTEGER): INTEGER;
-BEGIN
-  IF a > b THEN
-    a := b
-  END
-  RETURN a
-END min;
 PROCEDURE Align*(n: INTEGER): INTEGER;
   RETURN (4 - n MOD 4) MOD 4
 END Align;

 /programs/develop/oberon07/Source/X86.ob07
 ,5 → 1,5
 (*
-    Copyright 2016 Anton Krotov
+    Copyright 2016, 2017 Anton Krotov
     This file is part of Compiler.
 ,7 → 36,7
   stDEC* = 14; stINCL* = 15; stEXCL* = 16; stCOPY* = 17; stNEW* = 18; stASSERT* = 19;
   stPACK* = 20; stUNPK* = 21; stDISPOSE* = 22; stFABS* = 23; stINC1* = 24;
   stDEC1* = 25; stASSERT1* = 26; stUNPK1* = 27; stPACK1* = 28; stLSR* = 29;
-  stLENGTH* = 30;
+  stLENGTH* = 30; stMIN* = 31; stMAX* = 32;
   sysMOVE* = 108;
 ,7 → 1232,9
   |stASR:    PopECX; OutCode("58D3F8"); PushEAX
   |stLSL:    PopECX; OutCode("58D3E0"); PushEAX
   |stLSR:    PopECX; OutCode("58D3E8"); PushEAX
-  |stORD:    PopEDX; OutCode("85D274036A015A"); PushEDX
+  |stORD:    PopEDX; OutCode("85D274036A015A"); PushEDX;
+  |stMIN:    PopEDX; OutCode("3914247E025852");
+  |stMAX:    PopEDX; OutCode("3B14247E025852");
   |stLENGTH: CallRTL(_length); PushEAX
   ELSE
   END
 ,12 → 1271,12
   |TCHAR, TBOOLEAN:
     IF lastcmd.tcmd = ECMD THEN
       del;
-      OutCode("33D28A");
+      OutCode("0FB6");
       IntByte("55", "95", offset);
       PushEDX
     ELSE
       PopEDX;
-      OutCode("33C98A0A");
+      OutCode("0FB60A");
       PushECX
     END
   |TLONGREAL:

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7106 → Rev 7107