Przeglądaj źródła

included sysutils and math.pp as target. They compile now.

michael 27 lat temu
rodzic
commit
9865eea0ef

+ 12 - 1
rtl/dos/go32v1/makefile

@@ -120,7 +120,7 @@ LIBEXT=.a1
 
 # Define Linux Units
 SYSTEMPPU=system$(PPUEXT)
-OBJECTS=strings go32 objpas \
+OBJECTS=strings go32 objpas sysutils math\
 	dos crt objects printer \
 	cpu mmx mouse getopts graph \
 
@@ -185,6 +185,17 @@ objpas$(PPUEXT) : $(OBJPASDIR)/objpas.pp $(SYSTEMPPU)
 	$(PP) $(OPT) objpas $(REDIR)
 	$(DEL) objpas.pp
 
+sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp $(SYSTEMPPU) objpas$(PPUEXT) \
+                   dos$(PPUEXT)
+	$(COPY) $(OBJPASDIR)/sysutils.pp .
+	$(PP) $(OPT) -I$(OBJPASDIR) sysutils $(REDIR)
+	$(DEL) sysutils.pp
+
+math$(PPUEXT) : $(OBJPASDIR)/math.pp $(SYSTEMPPU) objpas$(PPUEXT) \
+                   dos$(PPUEXT)
+	$(COPY) $(OBJPASDIR)/math.pp .
+	$(PP) $(OPT) -I$(OBJPASDIR) math $(REDIR)
+	$(DEL) math.pp
 #
 # System Dependent Units
 #

+ 17 - 2
rtl/dos/go32v2/makefile

@@ -99,7 +99,7 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 
 # Define Linux Units
 SYSTEMPPU=system$(PPUEXT)
-OBJECTS=strings go32 objpas \
+OBJECTS=strings go32 objpas sysutils math\
 	dpmiexcp profile dxeload emu387 \
 	dos crt objects printer \
 	cpu mmx mouse getopts graph \
@@ -171,6 +171,18 @@ objpas$(PPUEXT) : $(OBJPASDIR)/objpas.pp $(SYSTEMPPU)
 	-$(PP) $(OPT) objpas.pp $(REDIR)
 	$(DEL) objpas.pp
 
+sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp $(SYSTEMPPU) objpas$(PPUEXT) \
+                   dos$(PPUEXT)
+	$(COPY) $(OBJPASDIR)/sysutils.pp .
+	$(PP) $(OPT) -I$(OBJPASDIR) sysutils $(REDIR)
+	$(DEL) sysutils.pp
+
+math$(PPUEXT) : $(OBJPASDIR)/math.pp $(SYSTEMPPU) objpas$(PPUEXT) \
+                   dos$(PPUEXT)
+	$(COPY) $(OBJPASDIR)/math.pp .
+	$(PP) $(OPT) -I$(OBJPASDIR) math $(REDIR)
+	$(DEL) math.pp
+
 #
 # System Dependent Units
 #
@@ -267,7 +279,10 @@ include $(CFG)/makefile.def
 
 #
 # $Log$
-# Revision 1.10  1998-07-22 21:37:03  michael
+# Revision 1.11  1998-07-29 15:44:37  michael
+#  included sysutils and math.pp as target. They compile now.
+#
+# Revision 1.10  1998/07/22 21:37:03  michael
 # make cycle now works
 #
 # Revision 1.9  1998/05/22 00:39:36  peter

+ 24 - 0
rtl/inc/except.inc

@@ -19,6 +19,8 @@
 
 
 Const 
+  { Type of exception. Currently only one.} 
+  FPC_EXCEPTION   = 1;
   { types of frames for the exception address stack}
   cExceptionFrame = 1;
   cFinalizeFrame  = 2;
@@ -53,6 +55,9 @@ var Buf : PJmp_buf;
     NewAddr : PExceptAddr;
     
 begin
+{$ifdef excdebug}
+  writeln ('In PushExceptAddr');
+{$endif}
   If ExceptAddrstack=Nil then
     begin
     New(ExceptAddrStack);
@@ -77,6 +82,9 @@ var
     Newobj : PExceptObject;
     
 begin
+{$ifdef excdebug}
+  writeln ('In PushExceptObject');
+{$endif}
   If ExceptObjectStack=Nil then
     begin
     New(ExceptObjectStack);
@@ -95,6 +103,10 @@ end;
 Function Raiseexcept (Obj : TObject; AnAddr : Pointer) : TObject;[Public, Alias : 'FPC_RAISEEXCEPTION'];
 
 begin
+{$ifdef excdebug}
+  writeln ('In RAiseException');
+{$endif}
+
   PushExceptObj(Obj,AnAddr);
   longjmp(ExceptAddrStack^.Buf^,FPC_Exception);
 end;
@@ -102,6 +114,10 @@ end;
 Procedure PopAddrStack ;[Public, Alias : 'FPC_POPADDRSTACK'];
 
 begin
+{$ifdef excdebug}
+  writeln ('In Popaddrstack');
+{$endif}
+
   If ExceptAddrStack=nil then
     begin
     writeln ('At end of ExceptionAddresStack');
@@ -114,6 +130,10 @@ end;
 Procedure PopObjectStack ;
 
 begin
+{$ifdef excdebug}
+  writeln ('In PopObjectstack');
+{$endif}
+
   If ExceptObjectStack=nil then
     begin
     writeln ('At end of ExceptionObjectStack');
@@ -126,6 +146,10 @@ end;
 Procedure ReRaise;[Public, Alias : 'FPC_RERAISE'];
 
 begin
+{$ifdef excdebug}
+  writeln ('In reraise');
+{$endif}
+
   PopAddrStack;
   If ExceptAddrStack=Nil then
     begin

+ 13 - 1
rtl/linux/makefile

@@ -115,7 +115,7 @@ endif
 
 # Define Linux Units
 SYSTEMPPU=syslinux$(PPUEXT)
-OBJECTS=strings linux objpas \
+OBJECTS=strings linux objpas sysutils math\
 	dos crt objects printer \
 	getopts errors sockets graph\
 
@@ -210,6 +210,18 @@ objpas$(PPUEXT) : $(OBJPASDIR)/objpas.pp $(SYSTEMPPU)
 	$(PP) $(OPT) objpas $(REDIR)
 	$(DEL) objpas.pp
 
+sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp $(SYSTEMPPU) objpas$(PPUEXT) \
+                   dos$(PPUEXT)
+	$(COPY) $(OBJPASDIR)/sysutils.pp .
+	$(PP) $(OPT) -I$(OBJPASDIR) sysutils $(REDIR)
+	$(DEL) sysutils.pp
+
+math$(PPUEXT) : $(OBJPASDIR)/math.pp $(SYSTEMPPU) objpas$(PPUEXT) \
+                   dos$(PPUEXT)
+	$(COPY) $(OBJPASDIR)/math.pp .
+	$(PP) $(OPT) -I$(OBJPASDIR) math $(REDIR)
+	$(DEL) math.pp
+
 #
 # System Dependent Units
 #

+ 8 - 5
rtl/objpas/math.pp

@@ -158,7 +158,7 @@ function randg(mean,stddev : float) : float;
 function popnstddev(const data : array of float) : float;
 function popnvariance(const data : array of float) : float;
 procedure momentskewkurtosis(const data : array of float;
-  var m1,m2,m3,m4,skew,kurtois : float);
+  var m1,m2,m3,m4,skew,kurtosis : float);
 
 { geometrical function }
 
@@ -498,7 +498,7 @@ procedure sumsandsquares(const data : array of float;
 function minvalue(const data : array of float) : float;
 
   var
-     i : longint
+     i : longint;
 
   begin
      { get an initial value }
@@ -542,7 +542,7 @@ function variance(const data : array of float) : float;
 
 function totalvariance(const data : array of float) : float;
 
-   var S,SS : Float
+   var S,SS : Float;
 
   begin
      SumsAndSquares(Data,S,SS);
@@ -617,8 +617,11 @@ end.
 
 {
     $Log$
-    Revision 1.1  1998-03-25 11:18:49  root
-    Initial revision
+    Revision 1.2  1998-07-29 15:44:34  michael
+     included sysutils and math.pp as target. They compile now.
+
+    Revision 1.1.1.1  1998/03/25 11:18:49  root
+    * Restored version
 
     Revision 1.2  1998/02/12 22:23:14  michael
     + All functions implemented, but untested

+ 6 - 1
rtl/objpas/objpas.pp

@@ -274,10 +274,15 @@ unit objpas;
 
 {$i except.inc}
 
+begin
+  InitExceptions
 end.
 {
   $Log$
-  Revision 1.3  1998-07-29 10:09:28  michael
+  Revision 1.4  1998-07-29 15:44:33  michael
+   included sysutils and math.pp as target. They compile now.
+
+  Revision 1.3  1998/07/29 10:09:28  michael
   + put in exception support
 
   Revision 1.2  1998/03/25 23:40:24  florian

+ 15 - 10
rtl/objpas/sysutils.pp

@@ -16,7 +16,7 @@ unit sysutils;
 
   interface
 
-  uses dos; { should become platform independent }
+  uses dos,objpas; { should become platform independent }
 
     type
        { some helpful data types }
@@ -35,21 +35,22 @@ unit sysutils;
 
        { exceptions }
 
-       exceptclass = class of exception;
-
        exception = class(tobject)
-       private
+        private
           fmessage : string;
           fhelpcontext : longint;
         public
           constructor create(const msg : string);
-          constructor createfmt(const msg; const args : array of const);
+//!! No array of const yet.
+//          constructor createfmt(const msg; const args : array of const);
           constructor createres(indent : longint);
           { !!!! }
           property helpcontext : longint read fhelpcontext write fhelpcontext;
           property message : string read fmessage write fmessage;
        end;
 
+       exceptclass = class of exception;
+
        { math. exceptions }
        einterror = class(exception);
        edivbyzero = class(einterror);
@@ -86,7 +87,7 @@ unit sysutils;
   { Read pchar handling functions implementation }
   {$i syspch.inc}
 
-    constructor texception.create(const msg : string);
+    constructor exception.create(const msg : string);
 
       begin
          inherited create;
@@ -94,14 +95,15 @@ unit sysutils;
          {!!!!!}
       end;
 
-    constructor texception.createfmt(const msg; const args : array of const);
+{
+    constructor exception.createfmt(const msg; const args : array of const);
 
       begin
          inherited create;
-         {!!!!!}
       end;
+}
 
-    constructor texception.createres(indent : longint);
+    constructor exception.createres(indent : longint);
 
       begin
          inherited create;
@@ -112,7 +114,10 @@ end.
 
 {
     $Log$
-    Revision 1.2  1998-04-10 15:18:21  michael
+    Revision 1.3  1998-07-29 15:44:32  michael
+     included sysutils and math.pp as target. They compile now.
+
+    Revision 1.2  1998/04/10 15:18:21  michael
     Added a lot of functions donated by GertJan Schouten
 
     Revision 1.1.1.1  1998/03/25 11:18:49  root