* fix for tests/test/testrang.pp bug

compiler/globals.pas

@@ -163,6 +163,8 @@ unit globals;
        aktglobalswitches : tglobalswitches;
        aktmoduleswitches : tmoduleswitches;
        aktlocalswitches  : tlocalswitches;
+       nextaktlocalswitches : tlocalswitches;
+       localswitcheschanged : boolean;
        aktmodeswitches   : tmodeswitches;
        {$IFDEF testvarsets}
         aktsetalloc,
@@ -1566,7 +1568,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.58  2000-04-14 12:27:57  pierre
+  Revision 1.59  2000-05-03 14:36:57  pierre
+   * fix for tests/test/testrang.pp bug
+
+  Revision 1.58  2000/04/14 12:27:57  pierre
    * setfiletime to both files in synchronize
 
   Revision 1.57  2000/03/23 15:35:47  peter

compiler/scandir.inc

@@ -588,9 +588,10 @@ const
         if (sw<>cs_localnone) and (state in ['-','+']) then
          begin
            if state='-' then
-            aktlocalswitches:=aktlocalswitches-[sw]
+            nextaktlocalswitches:=aktlocalswitches-[sw]
            else
-            aktlocalswitches:=aktlocalswitches+[sw];
+            nextaktlocalswitches:=aktlocalswitches+[sw];
+           localswitcheschanged:=true;
          end;
       end;
 
@@ -1332,7 +1333,10 @@ const
 
 {
   $Log$
-  Revision 1.78  2000-04-14 11:16:10  pierre
+  Revision 1.79  2000-05-03 14:36:58  pierre
+   * fix for tests/test/testrang.pp bug
+
+  Revision 1.78  2000/04/14 11:16:10  pierre
     * partial linklib change
       I could not use Pavel's code because it broke the current way
       linklib is used, which is messy :(

compiler/scanner.pas

@@ -1164,6 +1164,11 @@ implementation
       label
          exit_label;
       begin
+        if localswitcheschanged then
+          begin
+            aktlocalswitches:=nextaktlocalswitches;
+            localswitcheschanged:=false;
+          end;
       { was there already a token read, then return that token }
         if nexttoken<>NOTOKEN then
          begin
@@ -1811,7 +1816,10 @@ exit_label:
 end.
 {
   $Log$
-  Revision 1.110  2000-04-08 20:18:53  michael
+  Revision 1.111  2000-05-03 14:36:58  pierre
+   * fix for tests/test/testrang.pp bug
+
+  Revision 1.110  2000/04/08 20:18:53  michael
   * Fixed bug in readcomment that was dropping * characters
 
   Revision 1.109  2000/03/13 21:21:57  peter

compiler/switches.pas

@@ -90,9 +90,10 @@ begin
  unsupportedsw : Message1(scan_w_unsupported_switch,'$'+switch);
        localsw : begin
                    if state='+' then
-                    aktlocalswitches:=aktlocalswitches+[tlocalswitch(setsw)]
+                    nextaktlocalswitches:=aktlocalswitches+[tlocalswitch(setsw)]
                    else
-                    aktlocalswitches:=aktlocalswitches-[tlocalswitch(setsw)];
+                    nextaktlocalswitches:=aktlocalswitches-[tlocalswitch(setsw)];
+                   localswitcheschanged:=true;
                  { Message for linux which has global checking only }
                    if (switch='S') and (
 {$ifdef i386}
@@ -171,7 +172,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.26  2000-02-09 13:23:04  peter
+  Revision 1.27  2000-05-03 14:36:58  pierre
+   * fix for tests/test/testrang.pp bug
+
+  Revision 1.26  2000/02/09 13:23:04  peter
     * log truncated
 
   Revision 1.25  2000/01/07 01:14:39  peter
@@ -186,4 +190,4 @@ end.
   Revision 1.22  1999/08/01 23:35:06  michael
   * Alpha changes
 
-}
+}