Przeglądaj źródła

* overloading of assignment operator by different unique result types now possible

florian 20 lat temu
rodzic
commit
f6442b758c
3 zmienionych plików z 63 dodań i 940 usunięć
  1. 5 1
      compiler/options.pas
  2. 10 2
      compiler/pdecsub.pas
  3. 48 937
      compiler/pp.lpi

+ 5 - 1
compiler/options.pas

@@ -1790,6 +1790,7 @@ begin
   def_system_macro('HASGETHEAPSTATUS');
   def_system_macro('HASGETFPCHEAPSTATUS');
   def_system_macro('HASFUNCTIONCOPYDYNARR');
+  def_system_macro('HASOVERLOADASSIGNBYUNIQUERESULT');
 
 { using a case is pretty useless here (FK) }
 { some stuff for TP compatibility }
@@ -2114,7 +2115,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.173  2005-04-24 21:01:37  peter
+  Revision 1.174  2005-04-28 19:32:11  florian
+    * overloading of assignment operator by different unique result types now possible
+
+  Revision 1.173  2005/04/24 21:01:37  peter
     * always use exceptions to stop the compiler
     - remove stop, do_stop
 

+ 10 - 2
compiler/pdecsub.pas

@@ -2228,7 +2228,12 @@ const
                (compare_paras(pd.paras,hd.paras,cp_none,[cpo_comparedefaultvalue])>=te_equal) and
                { for operators equal_paras is not enough !! }
                ((pd.proctypeoption<>potype_operator) or (optoken<>_ASSIGNMENT) or
-                equal_defs(hd.rettype.def,pd.rettype.def))
+                { be careful here, equal_defs doesn't take care of unique }
+                (hd.rettype.def=pd.rettype.def) or
+                (equal_defs(hd.rettype.def,pd.rettype.def) and
+                 not(df_unique in hd.rettype.def.defoptions) and not(df_unique in pd.rettype.def.defoptions)
+                )
+               )
               ) then
              begin
                { Check if we've found the forwarddef, if found then
@@ -2461,7 +2466,10 @@ const
 end.
 {
   $Log$
-  Revision 1.233  2005-04-06 19:39:04  florian
+  Revision 1.234  2005-04-28 19:32:11  florian
+    * overloading of assignment operator by different unique result types now possible
+
+  Revision 1.233  2005/04/06 19:39:04  florian
     * fixed previous commit
 
   Revision 1.232  2005/04/06 19:09:39  florian

+ 48 - 937
compiler/pp.lpi

@@ -1,949 +1,70 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="4"/>
+    <PathDelim Value="\"/>
+    <Version Value="5"/>
     <General>
-      <ProjectType Value="Custom program"/>
       <Flags>
-        <MainUnitIsPascalSource Value="False"/>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
       </Flags>
       <MainUnit Value="0"/>
-      <ActiveEditorIndexAtStart Value="21"/>
-      <IconPath Value="./"/>
-      <TargetFileExt Value=""/>
+      <ActiveEditorIndexAtStart Value="2"/>
+      <TargetFileExt Value=".exe"/>
       <Title Value="pp"/>
     </General>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="5" HistoryIndex="4">
       <Position1>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1871" Column="34" TopLine="1857"/>
+        <Filename Value="pp.pas"/>
+        <Caret Line="1" Column="1" TopLine="37"/>
       </Position1>
       <Position2>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1285" Column="18" TopLine="1269"/>
+        <Filename Value="pp.pas"/>
+        <Caret Line="139" Column="50" TopLine="114"/>
       </Position2>
       <Position3>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1302" Column="18" TopLine="1288"/>
+        <Filename Value="cstreams.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position3>
       <Position4>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1338" Column="19" TopLine="1324"/>
+        <Filename Value="globals.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position4>
       <Position5>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1347" Column="19" TopLine="1333"/>
+        <Filename Value="globals.pas"/>
+        <Caret Line="1555" Column="38" TopLine="1536"/>
       </Position5>
-      <Position6>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1356" Column="19" TopLine="1342"/>
-      </Position6>
-      <Position7>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1365" Column="19" TopLine="1351"/>
-      </Position7>
-      <Position8>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1383" Column="19" TopLine="1369"/>
-      </Position8>
-      <Position9>
-        <Filename Value="cutils.pas"/>
-        <Caret Line="944" Column="55" TopLine="930"/>
-      </Position9>
-      <Position10>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1401" Column="19" TopLine="1387"/>
-      </Position10>
-      <Position11>
-        <Filename Value="cutils.pas"/>
-        <Caret Line="944" Column="55" TopLine="930"/>
-      </Position11>
-      <Position12>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1419" Column="19" TopLine="1396"/>
-      </Position12>
-      <Position13>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1428" Column="19" TopLine="1414"/>
-      </Position13>
-      <Position14>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1447" Column="19" TopLine="1433"/>
-      </Position14>
-      <Position15>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1456" Column="19" TopLine="1442"/>
-      </Position15>
-      <Position16>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1474" Column="19" TopLine="1460"/>
-      </Position16>
-      <Position17>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1483" Column="19" TopLine="1469"/>
-      </Position17>
-      <Position18>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1557" Column="19" TopLine="1589"/>
-      </Position18>
-      <Position19>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1575" Column="21" TopLine="1561"/>
-      </Position19>
-      <Position20>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1584" Column="22" TopLine="1570"/>
-      </Position20>
-      <Position21>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1269" Column="18" TopLine="1255"/>
-      </Position21>
-      <Position22>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1808" Column="44" TopLine="1794"/>
-      </Position22>
-      <Position23>
-        <Filename Value="pdecsub.pas"/>
-        <Caret Line="1819" Column="44" TopLine="1805"/>
-      </Position23>
-      <Position24>
-        <Filename Value="pmodules.pas"/>
-        <Caret Line="251" Column="47" TopLine="237"/>
-      </Position24>
-      <Position25>
-        <Filename Value="i386/ag386nsm.pas"/>
-        <Caret Line="776" Column="51" TopLine="762"/>
-      </Position25>
-      <Position26>
-        <Filename Value="i386/ag386int.pas"/>
-        <Caret Line="765" Column="51" TopLine="751"/>
-      </Position26>
-      <Position27>
-        <Filename Value="rautils.pas"/>
-        <Caret Line="1191" Column="18" TopLine="1177"/>
-      </Position27>
-      <Position28>
-        <Filename Value="compiler.pas"/>
-        <Caret Line="436" Column="10" TopLine="422"/>
-      </Position28>
-      <Position29>
-        <Filename Value="compiler.pas"/>
-        <Caret Line="334" Column="17" TopLine="320"/>
-      </Position29>
-      <Position30>
-        <Filename Value="compiler.pas"/>
-        <Caret Line="380" Column="13" TopLine="366"/>
-      </Position30>
     </JumpHistory>
-    <Units Count="110">
+    <Units Count="3">
       <Unit0>
-        <CursorPos X="11" Y="60"/>
+        <CursorPos X="7" Y="129"/>
+        <EditorIndex Value="0"/>
         <Filename Value="pp.pas"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="45"/>
+        <Loaded Value="True"/>
+        <TopLine Value="109"/>
         <UnitName Value="pp"/>
-        <UsageCount Value="226"/>
+        <UsageCount Value="20"/>
       </Unit0>
       <Unit1>
-        <CursorPos X="22" Y="101"/>
-        <Filename Value="fpcdefs.inc"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="11"/>
-      </Unit1>
-      <Unit2>
-        <CursorPos X="8" Y="322"/>
-        <Filename Value="paramgr.pas"/>
-        <TopLine Value="304"/>
-        <UnitName Value="paramgr"/>
-        <UsageCount Value="7"/>
-      </Unit2>
-      <Unit3>
-        <CursorPos X="18" Y="38"/>
-        <EditorIndex Value="22"/>
-        <Filename Value="cutils.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="24"/>
-        <UnitName Value="cutils"/>
-        <UsageCount Value="26"/>
-      </Unit3>
-      <Unit4>
-        <CursorPos X="43" Y="559"/>
-        <EditorIndex Value="9"/>
-        <Filename Value="fppu.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="545"/>
-        <UnitName Value="fppu"/>
-        <UsageCount Value="10"/>
-      </Unit4>
-      <Unit5>
-        <CursorPos X="50" Y="140"/>
-        <EditorIndex Value="0"/>
-        <Filename Value="comphook.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="117"/>
-        <UnitName Value="comphook"/>
-        <UsageCount Value="12"/>
-      </Unit5>
-      <Unit6>
-        <CursorPos X="1" Y="39"/>
-        <Filename Value="cg64f32.pas"/>
-        <TopLine Value="24"/>
-        <UnitName Value="cg64f32"/>
-        <UsageCount Value="11"/>
-      </Unit6>
-      <Unit7>
-        <CursorPos X="1" Y="84"/>
-        <Filename Value="ncgcal.pas"/>
-        <TopLine Value="68"/>
-        <UnitName Value="ncgcal"/>
-        <UsageCount Value="12"/>
-      </Unit7>
-      <Unit8>
-        <CursorPos X="36" Y="541"/>
-        <EditorIndex Value="6"/>
-        <Filename Value="cgobj.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="526"/>
-        <UnitName Value="cgobj"/>
-        <UsageCount Value="17"/>
-      </Unit8>
-      <Unit9>
-        <CursorPos X="20" Y="490"/>
-        <Filename Value="systems/t_linux.pas"/>
-        <TopLine Value="476"/>
-        <UnitName Value="t_linux"/>
-        <UsageCount Value="10"/>
-      </Unit9>
-      <Unit10>
-        <CursorPos X="1" Y="473"/>
-        <Filename Value="sparc/cgcpu.pas"/>
-        <TopLine Value="458"/>
-        <UsageCount Value="10"/>
-      </Unit10>
-      <Unit11>
-        <CursorPos X="16" Y="398"/>
-        <EditorIndex Value="21"/>
-        <Filename Value="compiler.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="384"/>
-        <UnitName Value="compiler"/>
-        <UsageCount Value="10"/>
-      </Unit11>
-      <Unit12>
-        <CursorPos X="40" Y="65"/>
-        <Filename Value="sparc/cpubase.pas"/>
-        <TopLine Value="54"/>
-        <UsageCount Value="1"/>
-      </Unit12>
-      <Unit13>
-        <CursorPos X="11" Y="23"/>
-        <Filename Value="sparc/cpuinfo.pas"/>
-        <TopLine Value="8"/>
-        <UnitName Value="cpuinfo"/>
-        <UsageCount Value="10"/>
-      </Unit13>
-      <Unit14>
-        <CursorPos X="23" Y="381"/>
+        <CursorPos X="1" Y="1"/>
         <EditorIndex Value="1"/>
-        <Filename Value="verbose.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="366"/>
-        <UnitName Value="verbose"/>
-        <UsageCount Value="11"/>
-      </Unit14>
-      <Unit15>
-        <CursorPos X="1" Y="148"/>
-        <Filename Value="pass_2.pas"/>
-        <TopLine Value="133"/>
-        <UnitName Value="pass_2"/>
-        <UsageCount Value="2"/>
-      </Unit15>
-      <Unit16>
-        <CursorPos X="33" Y="1414"/>
-        <Filename Value="globals.pas"/>
-        <TopLine Value="1400"/>
-        <UnitName Value="globals"/>
-        <UsageCount Value="65"/>
-      </Unit16>
-      <Unit17>
-        <CursorPos X="1" Y="1549"/>
-        <Filename Value="options.pas"/>
-        <TopLine Value="1532"/>
-        <UnitName Value="options"/>
-        <UsageCount Value="10"/>
-      </Unit17>
-      <Unit18>
-        <CursorPos X="1" Y="318"/>
-        <Filename Value="assemble.pas"/>
-        <TopLine Value="304"/>
-        <UnitName Value="assemble"/>
-        <UsageCount Value="60"/>
-      </Unit18>
-      <Unit19>
-        <CursorPos X="19" Y="920"/>
-        <Filename Value="aggas.pas"/>
-        <TopLine Value="902"/>
-        <UnitName Value="aggas"/>
-        <UsageCount Value="55"/>
-      </Unit19>
-      <Unit20>
-        <CursorPos X="13" Y="1301"/>
-        <Filename Value="browcol.pas"/>
-        <TopLine Value="1286"/>
-        <UnitName Value="browcol"/>
-        <UsageCount Value="10"/>
-      </Unit20>
-      <Unit21>
-        <CursorPos X="1" Y="387"/>
-        <Filename Value="parser.pas"/>
-        <TopLine Value="370"/>
-        <UnitName Value="parser"/>
-        <UsageCount Value="10"/>
-      </Unit21>
-      <Unit22>
-        <CursorPos X="16" Y="178"/>
-        <Filename Value="fmodule.pas"/>
-        <TopLine Value="169"/>
-        <UnitName Value="fmodule"/>
-        <UsageCount Value="10"/>
-      </Unit22>
-      <Unit23>
-        <CursorPos X="20" Y="3230"/>
-        <EditorIndex Value="4"/>
-        <Filename Value="scanner.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="3228"/>
-        <UnitName Value="scanner"/>
-        <UsageCount Value="26"/>
-      </Unit23>
-      <Unit24>
-        <CursorPos X="1" Y="295"/>
-        <Filename Value="globtype.pas"/>
-        <TopLine Value="270"/>
-        <UnitName Value="globtype"/>
-        <UsageCount Value="54"/>
-      </Unit24>
-      <Unit25>
-        <CursorPos X="1" Y="1768"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/unix/unix.pp"/>
-        <TopLine Value="1741"/>
-        <UnitName Value="Unix"/>
-        <UsageCount Value="10"/>
-      </Unit25>
-      <Unit26>
-        <CursorPos X="37" Y="37"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/inc/systemh.inc"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="1"/>
-      </Unit26>
-      <Unit27>
-        <CursorPos X="12" Y="167"/>
-        <Filename Value="finput.pas"/>
-        <TopLine Value="161"/>
-        <UnitName Value="finput"/>
-        <UsageCount Value="10"/>
-      </Unit27>
-      <Unit28>
-        <CursorPos X="1" Y="401"/>
-        <Filename Value="cclasses.pas"/>
-        <TopLine Value="381"/>
-        <UnitName Value="cclasses"/>
-        <UsageCount Value="22"/>
-      </Unit28>
-      <Unit29>
-        <CursorPos X="20" Y="313"/>
         <Filename Value="cstreams.pas"/>
-        <TopLine Value="298"/>
-        <UnitName Value="cstreams"/>
-        <UsageCount Value="1"/>
-      </Unit29>
-      <Unit30>
-        <CursorPos X="1" Y="1"/>
-        <Filename Value="tokens.pas"/>
-        <TopLine Value="1"/>
-        <UnitName Value="tokens"/>
-        <UsageCount Value="1"/>
-      </Unit30>
-      <Unit31>
-        <CursorPos X="10" Y="539"/>
-        <Filename Value="link.pas"/>
-        <TopLine Value="525"/>
-        <UnitName Value="link"/>
-        <UsageCount Value="2"/>
-      </Unit31>
-      <Unit32>
-        <CursorPos X="16" Y="97"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/inc/dosh.inc"/>
-        <TopLine Value="92"/>
-        <UsageCount Value="11"/>
-      </Unit32>
-      <Unit33>
-        <CursorPos X="1" Y="79"/>
-        <Filename Value="comprsrc.pas"/>
-        <TopLine Value="66"/>
-        <UnitName Value="comprsrc"/>
-        <UsageCount Value="10"/>
-      </Unit33>
-      <Unit34>
-        <CursorPos X="20" Y="446"/>
-        <Filename Value="systems/t_sunos.pas"/>
-        <TopLine Value="432"/>
-        <UnitName Value="t_sunos"/>
-        <UsageCount Value="10"/>
-      </Unit34>
-      <Unit35>
-        <CursorPos X="1" Y="43"/>
-        <Filename Value="systems/t_emx.pas"/>
-        <TopLine Value="26"/>
-        <UnitName Value="t_emx"/>
-        <UsageCount Value="10"/>
-      </Unit35>
-      <Unit36>
-        <CursorPos X="1" Y="43"/>
-        <Filename Value="systems/t_os2.pas"/>
-        <TopLine Value="26"/>
-        <UnitName Value="t_os2"/>
-        <UsageCount Value="10"/>
-      </Unit36>
-      <Unit37>
-        <CursorPos X="1" Y="30"/>
-        <Filename Value="systems/t_win32.pas"/>
-        <TopLine Value="14"/>
-        <UnitName Value="t_win32"/>
-        <UsageCount Value="10"/>
-      </Unit37>
-      <Unit38>
-        <CursorPos X="21" Y="510"/>
-        <Filename Value="systems/t_nwm.pas"/>
-        <TopLine Value="496"/>
-        <UnitName Value="t_nwm"/>
-        <UsageCount Value="10"/>
-      </Unit38>
-      <Unit39>
-        <CursorPos X="20" Y="215"/>
-        <Filename Value="systems/t_go32v2.pas"/>
-        <TopLine Value="201"/>
-        <UnitName Value="t_go32v2"/>
-        <UsageCount Value="10"/>
-      </Unit39>
-      <Unit40>
-        <CursorPos X="1" Y="64"/>
-        <Filename Value="systems/t_beos.pas"/>
-        <TopLine Value="48"/>
-        <UnitName Value="t_beos"/>
-        <UsageCount Value="10"/>
-      </Unit40>
-      <Unit41>
-        <CursorPos X="20" Y="137"/>
-        <Filename Value="systems/t_watcom.pas"/>
-        <TopLine Value="123"/>
-        <UnitName Value="t_watcom"/>
-        <UsageCount Value="10"/>
-      </Unit41>
-      <Unit42>
-        <CursorPos X="11" Y="137"/>
-        <Filename Value="dmisc.pas"/>
-        <TopLine Value="123"/>
-        <UnitName Value="dmisc"/>
-        <UsageCount Value="1"/>
-      </Unit42>
-      <Unit43>
-        <CursorPos X="17" Y="415"/>
-        <Filename Value="impdef.pas"/>
-        <TopLine Value="387"/>
-        <UnitName Value="impdef"/>
-        <UsageCount Value="11"/>
-      </Unit43>
-      <Unit44>
-        <CursorPos X="13" Y="88"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/objpas/sysutils/filutilh.inc"/>
-        <TopLine Value="61"/>
-        <UsageCount Value="11"/>
-      </Unit44>
-      <Unit45>
-        <CursorPos X="10" Y="28"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/objpas/sysutils/finah.inc"/>
-        <TopLine Value="14"/>
-        <UsageCount Value="10"/>
-      </Unit45>
-      <Unit46>
-        <CursorPos X="3" Y="31"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/objpas/sysutils/fina.inc"/>
-        <TopLine Value="28"/>
-        <UsageCount Value="10"/>
-      </Unit46>
-      <Unit47>
-        <CursorPos X="1" Y="120"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/inc/fexpand.inc"/>
-        <TopLine Value="323"/>
-        <UsageCount Value="10"/>
-      </Unit47>
-      <Unit48>
-        <CursorPos X="30" Y="914"/>
-        <Filename Value="x86/nx86add.pas"/>
-        <TopLine Value="900"/>
-        <UnitName Value="nx86add"/>
-        <UsageCount Value="2"/>
-      </Unit48>
-      <Unit49>
-        <CursorPos X="8" Y="36"/>
-        <Filename Value="ogbase.pas"/>
-        <TopLine Value="19"/>
-        <UnitName Value="ogbase"/>
-        <UsageCount Value="1"/>
-      </Unit49>
-      <Unit50>
-        <CursorPos X="29" Y="28"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/macos/dos.pp"/>
-        <TopLine Value="17"/>
-        <UnitName Value="Dos"/>
-        <UsageCount Value="1"/>
-      </Unit50>
-      <Unit51>
-        <CursorPos X="20" Y="551"/>
-        <Filename Value="systems/t_bsd.pas"/>
-        <TopLine Value="537"/>
-        <UnitName Value="t_bsd"/>
-        <UsageCount Value="10"/>
-      </Unit51>
-      <Unit52>
-        <CursorPos X="20" Y="553"/>
-        <Filename Value="systems/t_nwl.pas"/>
-        <TopLine Value="539"/>
-        <UnitName Value="t_nwl"/>
-        <UsageCount Value="10"/>
-      </Unit52>
-      <Unit53>
-        <CursorPos X="10" Y="241"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/unix/sysutils.pp"/>
-        <TopLine Value="227"/>
-        <UnitName Value="sysutils"/>
-        <UsageCount Value="11"/>
-      </Unit53>
-      <Unit54>
-        <CursorPos X="27" Y="1"/>
-        <Filename Value="utils/fixlog.pp"/>
-        <TopLine Value="1"/>
-        <UnitName Value="fixlog"/>
-        <UsageCount Value="10"/>
-      </Unit54>
-      <Unit55>
-        <CursorPos X="12" Y="551"/>
-        <Filename Value="globals_new.pas"/>
-        <TopLine Value="284"/>
-        <UnitName Value="globals"/>
-        <UsageCount Value="10"/>
-      </Unit55>
-      <Unit56>
-        <CursorPos X="1" Y="383"/>
-        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/unix/dos.pp"/>
-        <TopLine Value="356"/>
-        <UnitName Value="Dos"/>
-        <UsageCount Value="11"/>
-      </Unit56>
-      <Unit57>
-        <CursorPos X="3" Y="201"/>
-        <Filename Value="aasmbase.pas"/>
-        <TopLine Value="187"/>
-        <UnitName Value="aasmbase"/>
-        <UsageCount Value="11"/>
-      </Unit57>
-      <Unit58>
-        <CursorPos X="3" Y="618"/>
-        <Filename Value="aasmtai.pas"/>
-        <TopLine Value="604"/>
-        <UnitName Value="aasmtai"/>
-        <UsageCount Value="11"/>
-      </Unit58>
-      <Unit59>
-        <CursorPos X="1" Y="68"/>
-        <Filename Value="cmsgs.pas"/>
-        <TopLine Value="52"/>
-        <UnitName Value="cmsgs"/>
-        <UsageCount Value="11"/>
-      </Unit59>
-      <Unit60>
-        <CursorPos X="3" Y="30"/>
-        <Filename Value="gdb.pas"/>
-        <TopLine Value="16"/>
-        <UnitName Value="gdb"/>
-        <UsageCount Value="10"/>
-      </Unit60>
-      <Unit61>
-        <CursorPos X="1" Y="71"/>
-        <Filename Value="ncgcon.pas"/>
-        <TopLine Value="56"/>
-        <UnitName Value="ncgcon"/>
-        <UsageCount Value="10"/>
-      </Unit61>
-      <Unit62>
-        <CursorPos X="1" Y="115"/>
-        <Filename Value="ncgutil.pas"/>
-        <TopLine Value="99"/>
-        <UnitName Value="ncgutil"/>
-        <UsageCount Value="10"/>
-      </Unit62>
-      <Unit63>
-        <CursorPos X="1" Y="34"/>
-        <Filename Value="ncnv.pas"/>
-        <TopLine Value="19"/>
-        <UnitName Value="ncnv"/>
-        <UsageCount Value="10"/>
-      </Unit63>
-      <Unit64>
-        <CursorPos X="3" Y="388"/>
-        <Filename Value="nflw.pas"/>
-        <TopLine Value="374"/>
-        <UnitName Value="nflw"/>
-        <UsageCount Value="10"/>
-      </Unit64>
-      <Unit65>
-        <CursorPos X="32" Y="821"/>
-        <EditorIndex Value="12"/>
-        <Filename Value="nobj.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="807"/>
-        <UnitName Value="nobj"/>
-        <UsageCount Value="10"/>
-      </Unit65>
-      <Unit66>
-        <CursorPos X="3" Y="32"/>
-        <Filename Value="tpexcept.pas"/>
-        <TopLine Value="18"/>
-        <UnitName Value="tpexcept"/>
-        <UsageCount Value="10"/>
-      </Unit66>
-      <Unit67>
-        <CursorPos X="1" Y="161"/>
-        <Filename Value="oglx.pas"/>
-        <TopLine Value="145"/>
-        <UnitName Value="oglx"/>
-        <UsageCount Value="10"/>
-      </Unit67>
-      <Unit68>
-        <CursorPos X="1" Y="171"/>
-        <Filename Value="ogcoff.pas"/>
-        <TopLine Value="155"/>
-        <UnitName Value="ogcoff"/>
-        <UsageCount Value="10"/>
-      </Unit68>
-      <Unit69>
-        <CursorPos X="1" Y="116"/>
-        <Filename Value="ogelf.pas"/>
-        <TopLine Value="100"/>
-        <UnitName Value="ogelf"/>
-        <UsageCount Value="10"/>
-      </Unit69>
-      <Unit70>
-        <CursorPos X="1" Y="74"/>
-        <Filename Value="owar.pas"/>
-        <TopLine Value="58"/>
-        <UnitName Value="owar"/>
-        <UsageCount Value="10"/>
-      </Unit70>
-      <Unit71>
-        <CursorPos X="1" Y="44"/>
-        <Filename Value="pdecobj.pas"/>
-        <TopLine Value="29"/>
-        <UnitName Value="pdecobj"/>
-        <UsageCount Value="10"/>
-      </Unit71>
-      <Unit72>
-        <CursorPos X="35" Y="1871"/>
-        <EditorIndex Value="16"/>
-        <Filename Value="pdecsub.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="1857"/>
-        <UnitName Value="pdecsub"/>
-        <UsageCount Value="10"/>
-      </Unit72>
-      <Unit73>
-        <CursorPos X="1" Y="59"/>
-        <Filename Value="pdecvar.pas"/>
-        <TopLine Value="44"/>
-        <UnitName Value="pdecvar"/>
-        <UsageCount Value="10"/>
-      </Unit73>
-      <Unit74>
-        <CursorPos X="1" Y="51"/>
-        <Filename Value="pexports.pas"/>
-        <TopLine Value="36"/>
-        <UnitName Value="pexports"/>
-        <UsageCount Value="10"/>
-      </Unit74>
-      <Unit75>
-        <CursorPos X="3" Y="65"/>
-        <Filename Value="pexpr.pas"/>
-        <TopLine Value="51"/>
-        <UnitName Value="pexpr"/>
-        <UsageCount Value="10"/>
-      </Unit75>
-      <Unit76>
-        <CursorPos X="1" Y="47"/>
-        <Filename Value="pinline.pas"/>
-        <TopLine Value="32"/>
-        <UnitName Value="pinline"/>
-        <UsageCount Value="10"/>
-      </Unit76>
-      <Unit77>
-        <CursorPos X="1" Y="52"/>
-        <Filename Value="psystem.pas"/>
-        <TopLine Value="37"/>
-        <UnitName Value="psystem"/>
-        <UsageCount Value="10"/>
-      </Unit77>
-      <Unit78>
-        <CursorPos X="1" Y="40"/>
-        <Filename Value="ptconst.pas"/>
-        <TopLine Value="24"/>
-        <UnitName Value="ptconst"/>
-        <UsageCount Value="10"/>
-      </Unit78>
-      <Unit79>
-        <CursorPos X="19" Y="1191"/>
-        <EditorIndex Value="20"/>
-        <Filename Value="rautils.pas"/>
         <Loaded Value="True"/>
-        <TopLine Value="1176"/>
-        <UnitName Value="RAUtils"/>
-        <UsageCount Value="10"/>
-      </Unit79>
-      <Unit80>
-        <CursorPos X="1" Y="37"/>
-        <Filename Value="rgobj.pas"/>
-        <TopLine Value="22"/>
-        <UnitName Value="rgobj"/>
-        <UsageCount Value="10"/>
-      </Unit80>
-      <Unit81>
-        <CursorPos X="34" Y="5770"/>
-        <EditorIndex Value="8"/>
-        <Filename Value="symdef.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="5756"/>
-        <UnitName Value="symdef"/>
-        <UsageCount Value="11"/>
-      </Unit81>
-      <Unit82>
-        <CursorPos X="1" Y="309"/>
-        <Filename Value="symsym.pas"/>
-        <TopLine Value="293"/>
-        <UnitName Value="symsym"/>
-        <UsageCount Value="10"/>
-      </Unit82>
-      <Unit83>
-        <CursorPos X="1" Y="38"/>
-        <Filename Value="widestr.pas"/>
-        <TopLine Value="23"/>
-        <UnitName Value="widestr"/>
-        <UsageCount Value="10"/>
-      </Unit83>
-      <Unit84>
-        <CursorPos X="1" Y="1539"/>
-        <Filename Value="options_new.pas"/>
-        <TopLine Value="1522"/>
-        <UnitName Value="options"/>
-        <UsageCount Value="10"/>
-      </Unit84>
-      <Unit85>
-        <CursorPos X="3" Y="237"/>
-        <Filename Value="charset.pas"/>
-        <TopLine Value="223"/>
-        <UnitName Value="charset"/>
-        <UsageCount Value="10"/>
-      </Unit85>
-      <Unit86>
-        <CursorPos X="1" Y="2"/>
-        <Filename Value="msgtxt.inc"/>
         <TopLine Value="1"/>
+        <UnitName Value="cstreams"/>
         <UsageCount Value="10"/>
-      </Unit86>
-      <Unit87>
-        <CursorPos X="1" Y="47"/>
-        <Filename Value="powerpc/nppccal.pas"/>
-        <TopLine Value="31"/>
-        <UnitName Value="nppccal"/>
-        <UsageCount Value="10"/>
-      </Unit87>
-      <Unit88>
-        <CursorPos X="30" Y="1357"/>
-        <Filename Value="powerpc/agppcmpw.pas"/>
-        <TopLine Value="1343"/>
-        <UnitName Value="agppcmpw"/>
-        <UsageCount Value="10"/>
-      </Unit88>
-      <Unit89>
-        <CursorPos X="1" Y="51"/>
-        <Filename Value="i386/n386mem.pas"/>
-        <TopLine Value="36"/>
-        <UnitName Value="n386mem"/>
-        <UsageCount Value="10"/>
-      </Unit89>
-      <Unit90>
-        <CursorPos X="1" Y="35"/>
-        <Filename Value="i386/cgcpu.pas"/>
-        <TopLine Value="20"/>
-        <UnitName Value="cgcpu"/>
-        <UsageCount Value="10"/>
-      </Unit90>
-      <Unit91>
-        <CursorPos X="52" Y="776"/>
-        <EditorIndex Value="18"/>
-        <Filename Value="i386/ag386nsm.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="761"/>
-        <UnitName Value="ag386nsm"/>
-        <UsageCount Value="10"/>
-      </Unit91>
-      <Unit92>
-        <CursorPos X="52" Y="765"/>
-        <EditorIndex Value="19"/>
-        <Filename Value="i386/ag386int.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="750"/>
-        <UnitName Value="ag386int"/>
-        <UsageCount Value="10"/>
-      </Unit92>
-      <Unit93>
-        <CursorPos X="1" Y="43"/>
-        <Filename Value="x86/cpubase.pas"/>
-        <TopLine Value="28"/>
-        <UnitName Value="cpubase"/>
-        <UsageCount Value="10"/>
-      </Unit93>
-      <Unit94>
-        <CursorPos X="14" Y="328"/>
-        <Filename Value="utils/msg2inc.pp"/>
-        <TopLine Value="313"/>
-        <UnitName Value="msg2inc"/>
-        <UsageCount Value="10"/>
-      </Unit94>
-      <Unit95>
-        <CursorPos X="1" Y="39"/>
-        <Filename Value="arm/cpubase.pas"/>
-        <TopLine Value="24"/>
-        <UnitName Value="cpubase"/>
-        <UsageCount Value="10"/>
-      </Unit95>
-      <Unit96>
-        <CursorPos X="58" Y="468"/>
-        <EditorIndex Value="5"/>
-        <Filename Value="browlog.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="453"/>
-        <UnitName Value="browlog"/>
-        <UsageCount Value="10"/>
-      </Unit96>
-      <Unit97>
-        <CursorPos X="31" Y="106"/>
+      </Unit1>
+      <Unit2>
+        <CursorPos X="45" Y="27"/>
         <EditorIndex Value="2"/>
-        <Filename Value="catch.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="91"/>
-        <UnitName Value="catch"/>
-        <UsageCount Value="10"/>
-      </Unit97>
-      <Unit98>
-        <CursorPos X="51" Y="2057"/>
-        <EditorIndex Value="11"/>
-        <Filename Value="ncal.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="2043"/>
-        <UnitName Value="ncal"/>
-        <UsageCount Value="10"/>
-      </Unit98>
-      <Unit99>
-        <CursorPos X="61" Y="1177"/>
-        <EditorIndex Value="13"/>
-        <Filename Value="pstatmnt.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="1163"/>
-        <UnitName Value="pstatmnt"/>
-        <UsageCount Value="10"/>
-      </Unit99>
-      <Unit100>
-        <CursorPos X="9" Y="1789"/>
-        <Filename Value="scanner_ar.pas"/>
-        <TopLine Value="1775"/>
-        <UnitName Value="scanner"/>
-        <UsageCount Value="10"/>
-      </Unit100>
-      <Unit101>
-        <CursorPos X="40" Y="560"/>
-        <EditorIndex Value="15"/>
-        <Filename Value="pdecl.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="546"/>
-        <UnitName Value="pdecl"/>
-        <UsageCount Value="10"/>
-      </Unit101>
-      <Unit102>
-        <CursorPos X="43" Y="1110"/>
-        <EditorIndex Value="10"/>
-        <Filename Value="scandir.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="1096"/>
-        <UnitName Value="scandir"/>
-        <UsageCount Value="10"/>
-      </Unit102>
-      <Unit103>
-        <CursorPos X="41" Y="1387"/>
-        <EditorIndex Value="14"/>
-        <Filename Value="psub.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="1373"/>
-        <UnitName Value="psub"/>
-        <UsageCount Value="10"/>
-      </Unit103>
-      <Unit104>
-        <CursorPos X="55" Y="251"/>
-        <EditorIndex Value="17"/>
-        <Filename Value="pmodules.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="235"/>
-        <UnitName Value="pmodules"/>
-        <UsageCount Value="10"/>
-      </Unit104>
-      <Unit105>
-        <CursorPos X="3" Y="154"/>
-        <Filename Value="ppheap.pas"/>
-        <TopLine Value="140"/>
-        <UnitName Value="ppheap"/>
-        <UsageCount Value="10"/>
-      </Unit105>
-      <Unit106>
-        <CursorPos X="51" Y="227"/>
-        <Filename Value="regvars.pas"/>
-        <TopLine Value="213"/>
-        <UnitName Value="regvars"/>
-        <UsageCount Value="10"/>
-      </Unit106>
-      <Unit107>
-        <CursorPos X="35" Y="2189"/>
-        <EditorIndex Value="7"/>
-        <Filename Value="symtable.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="2175"/>
-        <UnitName Value="symtable"/>
-        <UsageCount Value="10"/>
-      </Unit107>
-      <Unit108>
-        <CursorPos X="61" Y="84"/>
-        <Filename Value="powerpc/cpupi.pas"/>
-        <TopLine Value="69"/>
-        <UnitName Value="cpupi"/>
-        <UsageCount Value="10"/>
-      </Unit108>
-      <Unit109>
-        <CursorPos X="28" Y="225"/>
-        <EditorIndex Value="3"/>
-        <Filename Value="symbase.pas"/>
+        <Filename Value="globals.pas"/>
         <Loaded Value="True"/>
-        <TopLine Value="210"/>
-        <UnitName Value="symbase"/>
+        <TopLine Value="97"/>
+        <UnitName Value="globals"/>
         <UsageCount Value="10"/>
-      </Unit109>
+      </Unit2>
     </Units>
     <PublishOptions>
       <Version Value="2"/>
@@ -954,53 +75,43 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <CommandLineParams Value="-artl -Fu$(FpcDir)/rtl/unix -Fu$(FpcDir)/rtl/linux -Fu$(FpcDir)/rtl/sparc -Fu$(FpcDir)/rtl/inc -Fu$(FpcDir)/rtl/linux/sparc -Fu$(FpcDir)/rtl/objpas -Fu$(FpcDir)/rtl/inc -FD/usr/local/bin/sparc-linux -Fi$(FpcDir)/rtl/unix -Fi$(FpcDir)/rtl/linux -Fi$(FpcDir)/rtl/sparc -Fi$(FpcDir)/rtl/inc -Fi$(FpcDir)/rtl/linux/sparc -Fi$(FpcDir)/rtl/objpas/sysutils -FE$(FpcDir)/tests/test -dSPARC cg/tcnvint2.pp"/>
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
-        <WorkingDirectory Value="/home/neifer/FPC/Demo/src/fpc/tests/test/"/>
       </local>
     </RunParams>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="2"/>
+    <Version Value="5"/>
+    <PathDelim Value="\"/>
     <SearchPaths>
-      <IncludeFiles Value="i386/;../compiler/"/>
-      <OtherUnitFiles Value="/tmp/;i386/;x86/;systems/;../compiler/"/>
-      <UnitOutputDirectory Value="/tmp"/>
+      <OtherUnitFiles Value="i386\;x86\"/>
+      <UnitOutputDirectory Value="C:\fpc\compiler\myunits"/>
     </SearchPaths>
     <Parsing>
       <Style Value="2"/>
     </Parsing>
     <CodeGeneration>
-      <UnitStyle Value="2"/>
       <Generate Value="Faster"/>
-      <TargetOS Value="Linux"/>
+      <TargetProcessor Value="3"/>
+      <TargetOS Value="Win32"/>
     </CodeGeneration>
-    <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <UseHeaptrc Value="True"/>
-      </Debugging>
-    </Linking>
     <Other>
-      <CustomOptions Value="-dExtDebug -di386 -dGDB -dBROWSERLOG -RATT -dUSE_SYSUTILS"/>
+      <ConfigFile>
+        <StopAfterErrCount Value="50"/>
+      </ConfigFile>
+      <CustomOptions Value="-dGDB
+-di386
+"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="2">
+    <Exceptions Count="2">
       <Item1>
-        <Source Value="paramgr.pas"/>
-        <Line Value="427"/>
+        <Name Value="ECodetoolError"/>
       </Item1>
       <Item2>
-        <Source Value="cgobj.pas"/>
-        <Line Value="640"/>
+        <Name Value="EFOpenError"/>
       </Item2>
-    </BreakPoints>
-    <Watches Count="4">
-      <Item1>
-        <Expression Value="lastfileinfo.line"/>
-      </Item1>
-    </Watches>
+    </Exceptions>
   </Debugging>
 </CONFIG>