Browse Source

* newcnv -> not oldcnv

peter 27 years ago
parent
commit
d02a24bc75
4 changed files with 26 additions and 14 deletions
  1. 7 4
      compiler/cg386cnv.pas
  2. 7 4
      compiler/htypechk.pas
  3. 7 4
      compiler/tccnv.pas
  4. 5 2
      compiler/tree.pas

+ 7 - 4
compiler/cg386cnv.pas

@@ -49,7 +49,7 @@ implementation
     type
     type
       tsecondconvproc = procedure(pto,pfrom : ptree;convtyp : tconverttype);
       tsecondconvproc = procedure(pto,pfrom : ptree;convtyp : tconverttype);
 
 
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
 
 
     procedure second_int_to_int(pto,pfrom : ptree;convtyp : tconverttype);
     procedure second_int_to_int(pto,pfrom : ptree;convtyp : tconverttype);
       var
       var
@@ -478,7 +478,7 @@ implementation
            maybe_rangechecking(pto,pfrom^.resulttype,pto^.resulttype);
            maybe_rangechecking(pto,pfrom^.resulttype,pto^.resulttype);
        end;
        end;
 
 
-{$endif NEWCNV}
+{$endif}
 
 
     procedure second_string_to_string(pto,pfrom : ptree;convtyp : tconverttype);
     procedure second_string_to_string(pto,pfrom : ptree;convtyp : tconverttype);
       var
       var
@@ -1267,7 +1267,7 @@ implementation
     procedure secondtypeconv(var p : ptree);
     procedure secondtypeconv(var p : ptree);
       const
       const
          secondconvert : array[tconverttype] of tsecondconvproc = (
          secondconvert : array[tconverttype] of tsecondconvproc = (
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
            second_nothing, {equal}
            second_nothing, {equal}
            second_nothing, {not_possible}
            second_nothing, {not_possible}
            second_string_to_string,
            second_string_to_string,
@@ -1449,7 +1449,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.37  1998-11-26 21:33:06  peter
+  Revision 1.38  1998-11-29 12:40:19  peter
+    * newcnv -> not oldcnv
+
+  Revision 1.37  1998/11/26 21:33:06  peter
     * rangecheck updates
     * rangecheck updates
 
 
   Revision 1.36  1998/11/26 14:39:11  peter
   Revision 1.36  1998/11/26 14:39:11  peter

+ 7 - 4
compiler/htypechk.pas

@@ -64,7 +64,7 @@ implementation
     function isconvertable(def_from,def_to : pdef;
     function isconvertable(def_from,def_to : pdef;
              var doconv : tconverttype;fromtreetype : ttreetyp;
              var doconv : tconverttype;fromtreetype : ttreetyp;
              explicit : boolean) : boolean;
              explicit : boolean) : boolean;
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
       { Tbasetype:  uauto,uvoid,uchar,
       { Tbasetype:  uauto,uvoid,uchar,
                     u8bit,u16bit,u32bit,
                     u8bit,u16bit,u32bit,
                     s8bit,s16bit,s32,
                     s8bit,s16bit,s32,
@@ -167,7 +167,7 @@ implementation
                case def_from^.deftype of
                case def_from^.deftype of
                  orddef :
                  orddef :
                    begin
                    begin
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
                      doconv:=basedefconverts[basedeftbl[porddef(def_from)^.typ],basedeftbl[porddef(def_to)^.typ]];
                      doconv:=basedefconverts[basedeftbl[porddef(def_from)^.typ],basedeftbl[porddef(def_to)^.typ]];
                      b:=true;
                      b:=true;
                      if (doconv=tc_not_possible) or
                      if (doconv=tc_not_possible) or
@@ -185,7 +185,7 @@ implementation
                        b:=false;
                        b:=false;
 {$endif}
 {$endif}
                    end;
                    end;
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
                  enumdef :
                  enumdef :
                    begin
                    begin
                      doconv:=tc_int_2_int;
                      doconv:=tc_int_2_int;
@@ -710,7 +710,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.9  1998-11-26 13:10:42  peter
+  Revision 1.10  1998-11-29 12:40:23  peter
+    * newcnv -> not oldcnv
+
+  Revision 1.9  1998/11/26 13:10:42  peter
     * new int - int conversion -dNEWCNV
     * new int - int conversion -dNEWCNV
     * some function renamings
     * some function renamings
 
 

+ 7 - 4
compiler/tccnv.pas

@@ -234,7 +234,7 @@ implementation
     type
     type
        tfirstconvproc = procedure(var p : ptree);
        tfirstconvproc = procedure(var p : ptree);
 
 
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
 
 
     procedure first_int_to_int(var p : ptree);
     procedure first_int_to_int(var p : ptree);
       begin
       begin
@@ -449,7 +449,7 @@ implementation
       end;
       end;
 
 
 
 
-{$ifndef NEWCNV}
+{$ifdef OLDCNV}
     procedure first_locmem(var p : ptree);
     procedure first_locmem(var p : ptree);
       begin
       begin
          p^.location.loc:=LOC_MEM;
          p^.location.loc:=LOC_MEM;
@@ -546,7 +546,7 @@ implementation
       proctype : tdeftype;
       proctype : tdeftype;
     const
     const
        firstconvert : array[tconverttype] of tfirstconvproc = (
        firstconvert : array[tconverttype] of tfirstconvproc = (
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
          first_nothing, {equal}
          first_nothing, {equal}
          first_nothing, {not_possible}
          first_nothing, {not_possible}
          first_string_to_string,
          first_string_to_string,
@@ -955,7 +955,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.9  1998-11-26 13:10:43  peter
+  Revision 1.10  1998-11-29 12:40:24  peter
+    * newcnv -> not oldcnv
+
+  Revision 1.9  1998/11/26 13:10:43  peter
     * new int - int conversion -dNEWCNV
     * new int - int conversion -dNEWCNV
     * some function renamings
     * some function renamings
 
 

+ 5 - 2
compiler/tree.pas

@@ -129,7 +129,7 @@ unit tree;
           loadvmtn
           loadvmtn
        );
        );
 
 
-{$ifdef NEWCNV}
+{$ifndef OLDCNV}
        tconverttype = (
        tconverttype = (
           tc_equal,
           tc_equal,
           tc_not_possible,
           tc_not_possible,
@@ -1652,7 +1652,10 @@ unit tree;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.54  1998-11-26 13:10:44  peter
+  Revision 1.55  1998-11-29 12:40:20  peter
+    * newcnv -> not oldcnv
+
+  Revision 1.54  1998/11/26 13:10:44  peter
     * new int - int conversion -dNEWCNV
     * new int - int conversion -dNEWCNV
     * some function renamings
     * some function renamings