Browse Source

* browser bugfixes
was adding a reference when looking for the symbol
if -bSYM_NAME was used

pierre 27 years ago
parent
commit
9589f619d7
8 changed files with 239 additions and 173 deletions
  1. 18 4
      compiler/browser.pas
  2. 2 0
      compiler/msgidx.inc
  3. 148 145
      compiler/msgtxt.inc
  4. 9 4
      compiler/parser.pas
  5. 9 3
      compiler/pbase.pas
  6. 36 13
      compiler/pdecl.pas
  7. 10 2
      compiler/ppu.pas
  8. 7 2
      compiler/symsym.inc

+ 18 - 4
compiler/browser.pas

@@ -123,15 +123,18 @@ implementation
         inputfile:=get_source_file(moduleindex,posinfo.fileindex);
         inputfile:=get_source_file(moduleindex,posinfo.fileindex);
         if assigned(inputfile) then
         if assigned(inputfile) then
           if status.use_gccoutput then
           if status.use_gccoutput then
+          { for use with rhide
+            add warning so that it does not interpret
+            this as an error !! }
             get_file_line:=lower(inputfile^.name^)
             get_file_line:=lower(inputfile^.name^)
-              +':'+tostr(posinfo.line)+':'+tostr(posinfo.column)+':'
+              +':'+tostr(posinfo.line)+': warning: '+tostr(posinfo.column)+':'
           else
           else
             get_file_line:=inputfile^.name^
             get_file_line:=inputfile^.name^
               +'('+tostr(posinfo.line)+','+tostr(posinfo.column)+')'
               +'('+tostr(posinfo.line)+','+tostr(posinfo.column)+')'
         else
         else
           if status.use_gccoutput then
           if status.use_gccoutput then
             get_file_line:='file_unknown:'
             get_file_line:='file_unknown:'
-              +tostr(posinfo.line)+':'+tostr(posinfo.column)+':'
+              +tostr(posinfo.line)+': warning: '+tostr(posinfo.column)+':'
           else
           else
             get_file_line:='file_unknown('
             get_file_line:='file_unknown('
               +tostr(posinfo.line)+','+tostr(posinfo.column)+')'
               +tostr(posinfo.line)+','+tostr(posinfo.column)+')'
@@ -153,6 +156,7 @@ implementation
       begin
       begin
         if logopen then
         if logopen then
          closelog;
          closelog;
+        dispose(elements_to_list,done);
       end;
       end;
 
 
 
 
@@ -252,7 +256,7 @@ implementation
         if not logopen then
         if not logopen then
          exit;
          exit;
       { add ident }
       { add ident }
-        if identidx>0 then
+        if (identidx>0) and not stderrlog then
          begin
          begin
            if bufidx+identidx>logbufsize then
            if bufidx+identidx>logbufsize then
             flushlog;
             flushlog;
@@ -314,6 +318,9 @@ implementation
               addlog('substring : '+ss);
               addlog('substring : '+ss);
           end;
           end;
       begin
       begin
+         { don't create a new reference when
+          looking for the symbol !! }
+         make_ref:=false;
          s:=sr;
          s:=sr;
          symt:=symtablestack;
          symt:=symtablestack;
          next_substring;
          next_substring;
@@ -354,6 +361,7 @@ implementation
               if not assigned(symt) then
               if not assigned(symt) then
                 begin
                 begin
                    addlog('!!!Symbol '+ss+' not found !!!');
                    addlog('!!!Symbol '+ss+' not found !!!');
+                   make_ref:=true;
                    exit;
                    exit;
                 end
                 end
               else
               else
@@ -419,6 +427,7 @@ implementation
              sym^.add_to_browserlog
              sym^.add_to_browserlog
            else
            else
              addlog('!!!Symbol '+ss+' not found !!!');
              addlog('!!!Symbol '+ss+' not found !!!');
+           make_ref:=true;
       end;
       end;
       
       
     procedure tbrowser.ident;
     procedure tbrowser.ident;
@@ -467,7 +476,12 @@ begin
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.8  1998-09-22 17:13:42  pierre
+  Revision 1.9  1998-09-23 15:38:59  pierre
+    * browser bugfixes
+      was adding a reference when looking for the symbol
+      if -bSYM_NAME was used
+
+  Revision 1.8  1998/09/22 17:13:42  pierre
     + browsing updated and developed
     + browsing updated and developed
       records and objects fields are also stored
       records and objects fields are also stored
 
 

+ 2 - 0
compiler/msgidx.inc

@@ -58,6 +58,7 @@ type tmsgconst=(
   parser_e_syntax_error,
   parser_e_syntax_error,
   parser_w_proc_far_ignored,
   parser_w_proc_far_ignored,
   parser_w_proc_near_ignored,
   parser_w_proc_near_ignored,
+  parser_w_proc_register_ignored,
   parser_e_no_dll_file_specified,
   parser_e_no_dll_file_specified,
   parser_e_constructorname_must_be_init,
   parser_e_constructorname_must_be_init,
   parser_e_destructorname_must_be_done,
   parser_e_destructorname_must_be_done,
@@ -416,6 +417,7 @@ type tmsgconst=(
   unit_u_ppu_write,
   unit_u_ppu_write,
   unit_f_ppu_cannot_write,
   unit_f_ppu_cannot_write,
   unit_f_ppu_read_error,
   unit_f_ppu_read_error,
+  unit_f_ppu_read_unexpected_end,
   unit_f_ppu_invalid_entry,
   unit_f_ppu_invalid_entry,
   unit_f_ppu_dbx_count_problem,
   unit_f_ppu_dbx_count_problem,
   unit_e_illegal_unit_name,
   unit_e_illegal_unit_name,

+ 148 - 145
compiler/msgtxt.inc

@@ -58,318 +58,319 @@ const msgtxt : array[0..00087,1..240] of char=(+
   'E_Parser - Syntax Error'#000+
   'E_Parser - Syntax Error'#000+
   'W_Proced','ure type FAR ignored'#000+
   'W_Proced','ure type FAR ignored'#000+
   'W_Procedure type NEAR ignored'#000+
   'W_Procedure type NEAR ignored'#000+
+  'W_Procedure type REGISTER ignored'#000+
   'E_No DLL File specified'#000+
   'E_No DLL File specified'#000+
   'E_Constructor name must be INIT'#000+
   'E_Constructor name must be INIT'#000+
   'E_Destructor name must be DONE'#000+
   'E_Destructor name must be DONE'#000+
   'E_Illegal open parameter'#000+
   'E_Illegal open parameter'#000+
   'E_Procedure type INLINE not supported'#000+
   'E_Procedure type INLINE not supported'#000+
-  'W_Private methods shouldn'#039't be VIRTUAL'#000,+
+  'W_Pri','vate methods shouldn'#039't be VIRTUAL'#000+
   'W_Constructor should be public'#000+
   'W_Constructor should be public'#000+
   'W_Destructor should be public'#000+
   'W_Destructor should be public'#000+
   'N_Class should have one destructor only'#000+
   'N_Class should have one destructor only'#000+
   'E_Local class definitions are not allowed'#000+
   'E_Local class definitions are not allowed'#000+
   'E_Anonym class definitions are not allowed'#000+
   'E_Anonym class definitions are not allowed'#000+
-  'E_Illegal parameter list'#000+
-  'E_Wrong parameter type specif','ied'#000+
+  'E_Illegal parameter ','list'#000+
+  'E_Wrong parameter type specified'#000+
   'E_Wrong amount of parameters specified'#000+
   'E_Wrong amount of parameters specified'#000+
   'E_overloaded identifier isn'#039't a function identifier'#000+
   'E_overloaded identifier isn'#039't a function identifier'#000+
   'E_overloaded functions have the same parameter list'#000+
   'E_overloaded functions have the same parameter list'#000+
-  'E_function header doesn'#039't match the forward declaration $1'#000+
-  'N_only values can be jumped over i','n enumeration types'#000+
+  'E_function header doesn'#039't match the forward declaration $1'#000,+
+  'N_only values can be jumped over in enumeration types'#000+
   'N_Interface and implementation names are different !'#000+
   'N_Interface and implementation names are different !'#000+
   'E_function nesting > 31'#000+
   'E_function nesting > 31'#000+
   'E_range check error while evaluating constants'#000+
   'E_range check error while evaluating constants'#000+
   'E_duplicate case label'#000+
   'E_duplicate case label'#000+
-  'E_typed constants of classes are not allowed'#000+
-  'E_functions variables of ove','rloaded functions are not allowed'#000+
+  'E_typed constants of classes are not al','lowed'#000+
+  'E_functions variables of overloaded functions are not allowed'#000+
   'E_string length must be a value from 1 to 255'#000+
   'E_string length must be a value from 1 to 255'#000+
   'W_use extended syntax of DISPOSE and NEW to generate instances of obje'+
   'W_use extended syntax of DISPOSE and NEW to generate instances of obje'+
   'cts'#000+
   'cts'#000+
   'E_class identifier expected'#000+
   'E_class identifier expected'#000+
-  'E_method identifier expected'#000+
-  'E_function header doesn'#039't mat','ch any method of this class'#000+
+  'E_method identifier expe','cted'#000+
+  'E_function header doesn'#039't match any method of this class'#000+
   'P_procedure/function $1'#000+
   'P_procedure/function $1'#000+
   'E_Illegal floating point constant'#000+
   'E_Illegal floating point constant'#000+
   'E_FAIL can be used in constructors only'#000+
   'E_FAIL can be used in constructors only'#000+
   'E_Destructors can'#039't have parameters'#000+
   'E_Destructors can'#039't have parameters'#000+
-  'E_Only class methods can be referred with class references'#000+
-  'E_Only class method','s can be accessed in class methods'#000+
+  'E_Only class methods can be referred with cl','ass references'#000+
+  'E_Only class methods can be accessed in class methods'#000+
   'E_Constant and CASE types do not match'#000+
   'E_Constant and CASE types do not match'#000+
   'E_The symbol can'#039't be exported from a library'#000+
   'E_The symbol can'#039't be exported from a library'#000+
   'W_A inherited method is hidden by $1'#000+
   'W_A inherited method is hidden by $1'#000+
-  'E_There is no method in an ancestor class to be overridden: $1'#000+
-  'E_No member is provi','ded to access property'#000+
+  'E_There is no method in an ancestor class to be o','verridden: $1'#000+
+  'E_No member is provided to access property'#000+
   'E_Illegal symbol for property access'#000+
   'E_Illegal symbol for property access'#000+
   'E_Cannot access a protected field of an object here'#000+
   'E_Cannot access a protected field of an object here'#000+
   'E_Cannot access a private field of an object here'#000+
   'E_Cannot access a private field of an object here'#000+
-  'W_overloaded of virtual method must be virtual: $1'#000+
-  'E_overloaded methods which ','are virtual must have the same return typ'+
-  'e: $1'#000+
+  'W_overloaded of virtual method must be virtu','al: $1'#000+
+  'E_overloaded methods which are virtual must have the same return type:'+
+  ' $1'#000+
   'E_EXPORT declared functions can'#039't be nested'#000+
   'E_EXPORT declared functions can'#039't be nested'#000+
   'E_methods can'#039't be EXPORTed'#000+
   'E_methods can'#039't be EXPORTed'#000+
   'E_call by var parameters have to match exactly'#000+
   'E_call by var parameters have to match exactly'#000+
-  'E_Class isn'#039't a parent class of the current class'#000+
-  'E_SELF is only allowed i','n methods'#000+
+  'E_Class isn'#039't a parent class of the curr','ent class'#000+
+  'E_SELF is only allowed in methods'#000+
   'E_methods can be only in other methods called direct with type identif'+
   'E_methods can be only in other methods called direct with type identif'+
   'ier of the class'#000+
   'ier of the class'#000+
   'E_Illegal use of '#039':'#039#000+
   'E_Illegal use of '#039':'#039#000+
   'E_range check error in set constructor or duplicate set element'#000+
   'E_range check error in set constructor or duplicate set element'#000+
-  'E_Pointer to object expected'#000+
-  'E_Expression must be construc','tor call'#000+
+  'E_Pointer to object expe','cted'#000+
+  'E_Expression must be constructor call'#000+
   'E_Expression must be destructor call'#000+
   'E_Expression must be destructor call'#000+
   'E_Illegal order of record elements'#000+
   'E_Illegal order of record elements'#000+
   'E_Expression type must be class or record type'#000+
   'E_Expression type must be class or record type'#000+
   'E_Functions with void return value can'#039't return any value'#000+
   'E_Functions with void return value can'#039't return any value'#000+
-  'E_constructors and destructors must be methods'#000+
-  'E_Opera','tor is not overloaded'#000+
+  'E_constructors and d','estructors must be methods'#000+
+  'E_Operator is not overloaded'#000+
   'E_Re-raise isn'#039't possible there'#000+
   'E_Re-raise isn'#039't possible there'#000+
   'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_Assembler incompatible with function return value'#000+
   'E_Assembler incompatible with function return value'#000+
-  'E_Procedure overloading is switched off'#000+
-  'E_It is not possible to over','load this operator (overload = instead)'#000+
+  'E_Procedure overloading is switche','d off'#000+
+  'E_It is not possible to overload this operator (overload = instead)'#000+
   'E_Comparative operator must return a boolean value'#000+
   'E_Comparative operator must return a boolean value'#000+
   'E_Only virtual methods can be abstract'#000+
   'E_Only virtual methods can be abstract'#000+
   'F_Use of unsupported feature!'#000+
   'F_Use of unsupported feature!'#000+
-  'E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
-  'W_Unknown procedure directive had',' to be ignored: $1'#000+
+  'E_The mix of CLASSES and OBJECTS isn'#039't allowed',#000+
+  'W_Unknown procedure directive had to be ignored: $1'#000+
   'E_absolute can only be associated to ONE variable'#000+
   'E_absolute can only be associated to ONE variable'#000+
   'E_absolute can only be associated a var or const'#000+
   'E_absolute can only be associated a var or const'#000+
   'E_Abtract methods shouldn'#039't have any definition (with function bod'+
   'E_Abtract methods shouldn'#039't have any definition (with function bod'+
   'y)'#000+
   'y)'#000+
-  'E_This overloaded function can'#039't be local (must be ex','ported)'#000+
+  'E_This overloaded f','unction can'#039't be local (must be exported)'#000+
   'W_Virtual methods are used without a constructor in $1'#000+
   'W_Virtual methods are used without a constructor in $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro undefined: $1'#000+
   'M_Macro undefined: $1'#000+
   'M_Macro $1 set to $2'#000+
   'M_Macro $1 set to $2'#000+
   'I_Compiling $1'#000+
   'I_Compiling $1'#000+
   'D_Compiling $1 for the second time'#000+
   'D_Compiling $1 for the second time'#000+
-  'E_Array properties aren'#039't allowed at this point'#000+
-  'E_No property fo','und to override'#000+
+  'E_Array properties aren'#039't allo','wed at this point'#000+
+  'E_No property found to override'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
   'ty in class $1'#000+
   'E_The default property must be an array property'#000+
   'E_The default property must be an array property'#000+
-  'E_Virtual constructors are only supported in class object model'#000+
-  'E_No default property avai','lable'#000+
+  'E_Virtual constructors are only supported in class objec','t model'#000+
+  'E_No default property available'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
   'E_Forward declaration of class $1 must be resolved here to use the cla'+
   'E_Forward declaration of class $1 must be resolved here to use the cla'+
   'ss as ancestor'#000+
   'ss as ancestor'#000+
   'E_Local operators not supported'#000+
   'E_Local operators not supported'#000+
-  'E_Procedure directive $1 not allowed in interface se','ction'#000+
+  'E_Procedure direct','ive $1 not allowed in interface section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
   'E_Procedure directive $1 not allowed in procvar declaration'#000+
   'E_Procedure directive $1 not allowed in procvar declaration'#000+
   'E_Function is already declared Public/Forward $1'#000+
   'E_Function is already declared Public/Forward $1'#000+
-  'E_Can'#039't use both EXPORT and EXTERNAL'#000+
+  'E_Can'#039't use both EXPORT and ','EXTERNAL'#000+
   'E_NAME keyword expected'#000+
   'E_NAME keyword expected'#000+
-  'W','_$1 not yet supported inside inline procedure/function'#000+
+  'W_$1 not yet supported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
   'I_Writing Browser log $1'#000+
   'H_may be pointer dereference is missing'#000+
   'H_may be pointer dereference is missing'#000+
   'F_Selected assembler reader not supported'#000+
   'F_Selected assembler reader not supported'#000+
-  'E_Procedure directive $1 has conflicts with other directiv','es'#000+
+  'E_Procedure directive $1',' has conflicts with other directives'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
   'E_Register calling (fastcall) not supported'#000+
   'E_Property can'#039't have a default value'#000+
   'E_Property can'#039't have a default value'#000+
   'E_The default value of a property must be constant'#000+
   'E_The default value of a property must be constant'#000+
-  'E_Symbol can'#039't be published, can be only a class'#000+
-  'E_That kind ','of property can'#039't be published'#000+
+  'E_Symbol can'#039't be published',', can be only a class'#000+
+  'E_That kind of property can'#039't be published'#000+
   'E_Type mismatch'#000+
   'E_Type mismatch'#000+
   'E_Integer expression expected'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
   'E_Ordinal expression expected'#000+
   'E_Type identifier expected'#000+
   'E_Type identifier expected'#000+
   'E_Variable identifier expected'#000+
   'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_pointer type expected'#000+
-  'E_class type expected'#000+
-  'E_Variable or type indentifie','r expected'#000+
+  'E_class type expe','cted'#000+
+  'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Set elements are not compatible'#000+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'eger type'#000+
   'eger type'#000+
-  'W_Using / will give a floating point result'#000+
-  'H_use DIV instead to get an intege','r result'#000+
+  'W_Using / will give a floating point result'#000,+
+  'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
   'E_Can'#039't read or write variables of this type'#000+
   'E_Type conflict between set elements'#000+
   'E_Type conflict between set elements'#000+
-  'E_Integer or real expression expected'#000+
-  'E_Ident','ifier not found $1'#000+
+  'E_Integer o','r real expression expected'#000+
+  'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'E_Duplicate identifier $1'#000+
   'E_Unknown identifier $1'#000+
   'E_Unknown identifier $1'#000+
   'E_Forward declaration not solved: $1'#000+
   'E_Forward declaration not solved: $1'#000+
   'F_Identifier type already defined as type'#000+
   'F_Identifier type already defined as type'#000+
-  'E_Error in type defenition'#000+
-  'E_Type identifier not defined',#000+
+  'E_Error in type defeni','tion'#000+
+  'E_Type identifier not defined'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
   'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with an abtsract method are not allo'+
-  'wed'#000+
-  'E_Label not defined ','$1'#000+
+  'E_Instances of classes or objects with an abtsract method ar','e not al'+
+  'lowed'#000+
+  'E_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set elements'#000+
-  'E_Forward class definition not r','esolved $1'#000+
+  'E_illegal type declaration of set element','s'#000+
+  'E_Forward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'H_Parameter not used $1'#000+
   'W_Local variable not used $1'#000+
   'W_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown field identifier'#000+
   'E_Unknown field identifier'#000+
   'W_Local variable $1 does not seem to be initialized'#000+
   'W_Local variable $1 does not seem to be initialized'#000+
-  'E_identifier idents no member $1'#000+
-  'B_','Found declaration: $1'#000+
+  'E','_identifier idents no member $1'#000+
+  'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
   'E_CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limit < low range limit'#000+
+  'E_High range limit < low range l','imit'#000+
   'E_Illegal counter variable'#000+
   'E_Illegal counter variable'#000+
-  'E_','Can'#039't determine which overloaded function to call'#000+
+  'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
   'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_illegal call by reference parameters'#000,+
+  'E_ill','egal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
   'h to this context)'#000+
   'N_Inefficient code'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP'#000+
-  'E_Abstract methods can'#039't be calle','d directly'#000+
+  'E_procedure call with stackframe ESP/SP',#000+
+  'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_Internal Error in secondinline()'#000+
-  'D_Regi','ster $1 weight $2 $3'#000+
+  'F_Inter','nal Error in secondinline()'#000+
+  'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omited'#000+
   'D_Stack frame is omited'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
   'E_Unable to inline procvar calls'#000+
   'E_No code for inline procedure stored'#000+
   'E_No code for inline procedure stored'#000+
-  'F_Divide by zero in asm evaluator'#000+
-  'F_Evaluator stac','k overflow'#000+
+  'F_Divide by zero',' in asm evaluator'#000+
+  'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'F_Unknown error in asm evaluator'#000+
   'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
   'W_Invalid numeric value'#000+
   'E_escape sequence ignored: $1'#000+
   'E_escape sequence ignored: $1'#000+
-  'E_Asm syntax error - Prefix not foun','d'#000+
+  'E_','Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
   'E_Invalid symbol reference'#000+
   'W_Calling an overload function in an asm'#000+
   'W_Calling an overload function in an asm'#000+
   'E_Constant value out of bounds'#000+
   'E_Constant value out of bounds'#000+
-  'E_Non-label pattern contains @'#000+
-  'E_Invalid Oper','and: $1'#000+
+  'E_Non-label',' pattern contains @'#000+
+  'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
   'E_Error in octal constant: $1'#000+
   'E_Error in hexadecimal constant: $1'#000+
   'E_Error in hexadecimal constant: $1'#000+
   'E_Error in integer constant: $1'#000+
   'E_Error in integer constant: $1'#000+
   'E_Invalid labeled opcode'#000+
   'E_Invalid labeled opcode'#000+
-  'F_Internal error in Findtype()'#000+
-  'E_Invalid siz','e for MOVSX/MOVZX'#000+
+  'F_Internal',' error in Findtype()'#000+
+  'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
   'E_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
   'E_Constant reference not allowed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
-  'E_Invalid combination of opcode and operands'#000+
-  'W_Opcode $1 n','ot in table, operands not checked'#000+
+  'E_Invalid combination of',' opcode and operands'#000+
+  'W_Opcode $1 not in table, operands not checked'#000+
   'F_Internal Error in ConcatOpcode()'#000+
   'F_Internal Error in ConcatOpcode()'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
   'E_Invalid middle sized operand'#000+
   'E_Invalid three operand opcode'#000+
   'E_Invalid three operand opcode'#000+
   'E_Assembler syntax error'#000+
   'E_Assembler syntax error'#000+
-  'E_Invalid operand type'#000+
-  'E_Segment overrides not supported',#000+
+  'E_Invalid operand type',#000+
+  'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
   'F_Internal Errror converting octal'#000+
   'E_Invalid constant expression'#000+
   'E_Invalid constant expression'#000+
   'E_Unknown identifier: $1'#000+
   'E_Unknown identifier: $1'#000+
-  'E_Trying to define an index register more t','han once'#000+
+  'E_Trying ','to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
   'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
   'E_Invalid scaling value'#000+
   'E_Scaling value only allowed with index'#000+
   'E_Scaling value only allowed with index'#000+
-  'E_Invalid assembler syntax. No ref with brackets)'#000+
-  'E_Expressions of the form [sreg',':reg...] are currently not supported'#000+
+  'E_Invalid assembler syntax. No ref with bracket','s)'#000+
+  'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
   'E_Trying to define a segment register twice'#000+
   'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
   'E_Trying to define a base register twice'#000+
   'E_Trying to use a negative index register'#000+
   'E_Trying to use a negative index register'#000+
   'E_Asm syntax error - error in reference'#000+
   'E_Asm syntax error - error in reference'#000+
-  'E_Local symbols not allowed as refer','ences'#000+
+  'E_','Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid symbol name: $1'#000+
   'E_Invalid symbol name: $1'#000+
   'E_Invalid Reference syntax'#000+
   'E_Invalid Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null label references are not allowed'#000+
-  'W_Calling of an overloaded fun','ction in direct assembler'#000+
+  'E_Null label references are not allo','wed'#000+
+  'W_Calling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - register: $1'#000+
   'E_Asm syntax error - register: $1'#000+
   'E_SEG and OFFSET not supported'#000+
   'E_SEG and OFFSET not supported'#000+
-  'E_Asm syntax error - in opcode operand'#000+
-  'E_Invalid String expression'#000,+
+  'E_Asm syntax error - in opcode op','erand'#000+
+  'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
   'E_Constant expression out of bounds'#000+
   'F_Internal Error in BuildConstant()'#000+
   'F_Internal Error in BuildConstant()'#000+
   'W_A repeat prefix and a segment override on <= i386 may result in erro'+
   'W_A repeat prefix and a segment override on <= i386 may result in erro'+
   'rs if an interrupt occurs'#000+
   'rs if an interrupt occurs'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid or missing opcode'#000+
-  'E_Invalid combination of prefix and opcode: ','$1'#000+
+  'E_Invalid ','combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'E_Too many operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
   'E_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
   'E_Unknown label identifer: $1'#000+
   'E_Assemble node syntax error'#000+
   'E_Assemble node syntax error'#000+
   'E_Undefined local symbol: $1'#000+
   'E_Undefined local symbol: $1'#000+
-  'D_Starting intel styled assembler parsing..','.'#000+
+  'D_Startin','g intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
   'E_Not a directive or local symbol: $1'#000+
   'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
   'E_NOR not supported'#000+
   'E_Invalid floating point register name'#000+
   'E_Invalid floating point register name'#000+
   'W_Modulo not supported'#000+
   'W_Modulo not supported'#000+
-  'E_Invalid floating point constant: $','1'#000+
+  'E_','Invalid floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
   'E_Size suffix and destination register do not match'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
   'W_Floating point binary representation ignored'#000+
   'W_Floating point hexadecimal representation ignored'#000+
   'W_Floating point hexadecimal representation ignored'#000+
-  'W_Floating point octal representation ignored'#000,+
+  'W_Floating p','oint octal representation ignored'#000+
   'E_Invalid real constant expression'#000+
   'E_Invalid real constant expression'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
   'W_Identifier $1 supposed external'#000+
   'W_Identifier $1 supposed external'#000+
-  'E_Invalid segment override expressi','on'#000+
+  'E','_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
   'E_Strings not allowed as constants'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
-  'E_Invalid global definition'#000+
+  'E_Invalid global defin','ition'#000+
   'E_Line separator expected'#000+
   'E_Line separator expected'#000+
-  'W_','globl not supported'#000+
+  'W_globl not supported'#000+
   'W_align not supported'#000+
   'W_align not supported'#000+
   'W_lcomm not supported'#000+
   'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
   'E_Invalid global common definition'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
-  'E_assembler code not returned to tex','t'#000+
+  'E_','assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
   'F_internal error in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_NEAR ignored'#000+
@@ -377,41 +378,41 @@ const msgtxt : array[0..00087,1..240] of char=(+
   'D_Creating inline asm lookup tables'#000+
   'D_Creating inline asm lookup tables'#000+
   'W_Using a defined name as a local label'#000+
   'W_Using a defined name as a local label'#000+
   'F_internal error in HandleExtend()'#000+
   'F_internal error in HandleExtend()'#000+
-  'E_Invalid character: <'#000+
-  'E_Invalid charac','ter: >'#000+
+  'E_Inv','alid character: <'#000+
+  'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
   'E_Unsupported opcode'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
   'E_Invalid Register list for opcode'#000+
   'E_68020+ mode required to assemble'#000+
   'E_68020+ mode required to assemble'#000+
-  'D_Starting Motorola styled assembler parsing...'#000+
-  'D_','Finished Motorola styled assembler parsing...'#000+
+  'D_Starting Motor','ola styled assembler parsing...'#000+
+  'D_Finished Motorola styled assembler parsing...'#000+
   'W_XDEF not supported'#000+
   'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
   'ode'#000+
   'E_Invalid suffix for intel assembler'#000+
   'E_Invalid suffix for intel assembler'#000+
-  'E_Extended not supported in this mode'#000+
-  'E_Comp not supported in this',' mode'#000+
+  'E_Extended not supported in this',' mode'#000+
+  'E_Comp not supported in this mode'#000+
   'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
   'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
   'E_Unsupported symbol type for operand'#000+
   'I_Assembling (pipe) $1'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't create assember file $1'#000+
-  'W_Assembler $','1 not found, switching to external assembling'#000+
+  'E_Can'#039't cre','ate assember file $1'#000+
+  'W_Assembler $1 not found, switching to external assembling'#000+
   'U_Using assembler: $1'#000+
   'U_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'ing'#000+
   'I_Assembling $1'#000+
   'I_Assembling $1'#000+
-  'W_Linker $1 not found, switching to external link','ing'#000+
+  'W_Linker $1 not',' found, switching to external linking'#000+
   'U_Using linker: $1'#000+
   'U_Using linker: $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'I_Linking $1'#000+
-  'W_binder not found, switching to external ','binding'#000+
+  'W_binder',' not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
   'I_Closing script $1'#000+
@@ -419,8 +420,8 @@ const msgtxt : array[0..00087,1..240] of char=(+
   'D_PPU Time: $1'#000+
   'D_PPU Time: $1'#000+
   'D_PPU File too short'#000+
   'D_PPU File too short'#000+
   'D_PPU Invalid Header (no PPU at the begin)'#000+
   'D_PPU Invalid Header (no PPU at the begin)'#000+
-  'D_PPU Invalid Version $1'#000+
-  'D_PPU Flags: $1'#000,+
+  'D_PPU I','nvalid Version $1'#000+
+  'D_PPU Flags: $1'#000+
   'D_PPU Crc: $1'#000+
   'D_PPU Crc: $1'#000+
   'T_PPU Source: $1'#000+
   'T_PPU Source: $1'#000+
   'D_objectfile and assemblerfile are older than ppufile'#000+
   'D_objectfile and assemblerfile are older than ppufile'#000+
@@ -429,34 +430,35 @@ const msgtxt : array[0..00087,1..240] of char=(+
   'U_Writing $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_reading PPU-File'#000+
+  'F_unexpe','cted end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Dbx cou','nt problem'#000+
+  'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Too much units'#000+
   'F_Circular unit reference'#000+
   'F_Circular unit reference'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
-  'F_There were $1 errors compiling module, stopping'#000+
-  '$1 [options] <','inputfile> [options]'#000+
+  'F','_There were $1 errors compiling module, stopping'#000+
+  '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
   'W_DEF file can be created only for OS/2'#000+
   'E_nested response files are not supported'#000+
   'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
   'F_No source file name in command line'#000+
-  'E_Illegal parameter: $1'#000+
+  'E_I','llegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'H_-? writes help pages'#000+
-  'F_Too many config f','iles nested'#000+
+  'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
   'W_Target is already set to: $1'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
-  'F_too many IF(N)DEFs'#000+
+  'F_too many',' IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_too many ENDIFs'#000+
-  'F_open conditional at the end of t','he file'#000+
+  'F_open conditional at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'H_Try recompiling with -dGDB'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-98 by Florian Klaempfl'#000+
-  'Free Pascal Compiler version $F','PCVER'#000+
+  'Copyright ','(c) 1993-98 by Florian Klaempfl'#000+
+  'Free Pascal Compiler version $FPCVER'#000+
   #000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   'Compiler Target: $FPCTARGET'#000+
@@ -464,39 +466,39 @@ const msgtxt : array[0..00087,1..240] of char=(+
   'This program comes under the GNU General Public Licence'#000+
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   #000+
-  'Report bugs,suggestions etc to:'#000+
+  'Report bugs,suggesti','ons etc to:'#000+
   '                [email protected]'#000+
   '                [email protected]'#000+
-  '**','0*_+ switch option on, - off'#000+
+  '**0*_+ switch option on, - off'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file  (still BETA !!)'#000+
   '**2al_list sourcecode lines in assembler file  (still BETA !!)'#000+
   '*t1b_use EMS'#000+
   '*t1b_use EMS'#000+
-  '**1B_build all modules'#000+
+  '**1B_build',' all modules'#000+
   '**1C_code generation options'#000+
   '**1C_code generation options'#000+
-  '3*2CD_create dynamic ','library'#000+
+  '3*2CD_create dynamic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cr_range checking'#000+
-  '**2Cs<n>_set stack size to <n>'#000+
+  '**2Cs<n>_s','et stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '**2Ct_stack checking'#000+
-  '3*2CS_create static l','ibrary'#000+
+  '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1e<x>_set path to executable'#000+
-  '**1E_same as -Cn'#000+
+  '**1E_sa','me as -Cn'#000+
   '**1F_set file names and paths'#000+
   '**1F_set file names and paths'#000+
-  '**2Fe<x>_redirect error',' output to <x>'#000+
+  '**2Fe<x>_redirect error output to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
   '**2Fo<x>_adds <x> to object path'#000+
-  '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to unit path',#000+
+  '**2F','r<x>_load error message file <x>'#000+
+  '**2Fu<x>_adds <x> to unit path'#000+
   '*g1g_generate debugger information'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '*g2gd_use dbx'#000+
@@ -504,89 +506,90 @@ const msgtxt : array[0..00087,1..240] of char=(+
   '**1I<x>_adds <x> to include path'#000+
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't read the default config file'#000+
-  '**1o<x>_change the name of the executa','ble produced to <x>'#000+
+  '**1n_don'#039't read',' the default config file'#000+
+  '**1o<x>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof'#000+
   '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
   '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2 extensions on'#000+
+  '**2S2_switch some Delphi 2 extensions ','on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
-  '**2Sd_comp','iler disposes asm lists (uses less memory but slower)'#000+
+  '**2Sd_compiler disposes asm lists (uses less memory but slower)'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Si_support C++ stlyed INLINE'#000+
   '**2Si_support C++ stlyed INLINE'#000+
-  '**2Sm_support macros like C (global)'#000+
+  '**2Sm_support macros ','like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
-  '**2Sp_tr','ies to be gpc compatible'#000+
+  '**2Sp_tries to be gpc compatible'#000+
   '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**2St_allow static keyword in objects'#000+
-  '**2Sv_allow variable directives (cvar,external,public,export)'#000+
+  '**2Sv_allow variable directives (cvar,external,publi','c,export)'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
-  '*','*1T<x>_Target operating system'#000+
+  '**1T<x>_Target operating system'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TOS2_OS/2 2.x'#000+
-  '3*2TWin32_Windows 32 Bit'#000+
+  '3*2TWin32_Windows',' 32 Bit'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
-  '6*2','TMACOS_Macintosh m68k'#000+
+  '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
   '**1U_unit options'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Up<x>_same as -Fu<x>'#000+
-  '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combination of the following lette','rs :'#000+
+  '**2Us_compile a system unit'#000,+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
   '**2*_w : Show warnings               u : Show used files'#000+
   '**2*_w : Show warnings               u : Show used files'#000+
-  '**2*_n : Show notes                  t : Show tried files'#000+
+  '**2*_n : Show notes                  t : Show tried files'#000,+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
-  '**','2*_i : Show general info           p : Show compiled procedures'#000+
+  '**2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
+  '**2*_a : Show everything             0 : Show nothing ','(except errors'+
+  ')'#000+
   '**2*_b : Show all procedure'#000+
   '**2*_b : Show all procedure'#000+
-  '**2*_    declaratio','ns if an error'#000+
+  '**2*_    declarations if an error'#000+
   '**2*_    occurs'#000+
   '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
   '*L2Xc_link with the c library'#000+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
-  '**2Xs_strip all symbols from executable'#000+
-  '**2XS_link with static libraries (defines FPC_LINK_STA','TIC)'#000+
+  '**2Xs_strip all symbols from ex','ecutable'#000+
+  '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '**0*_Processor specific options:'#000+
   '3*1A_output format'#000+
   '3*1A_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Nasm'#000+
+  '3*2Anasmobj_obj',' file using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
-  '3*2Atasm_o','bj using Tasm (Borland)'#000+
+  '3*2Atasm_obj using Tasm (Borland)'#000+
   '3*1R_assembler reading style'#000+
   '3*1R_assembler reading style'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
-  '3*2Rdirect_copy assembler text directly to assembler file'#000+
+  '3*2Rdirect_copy assembler text directly to assembler ','file'#000+
   '3*1O<x>_optimizations'#000+
   '3*1O<x>_optimizations'#000+
   '3*2Og_generate smaller code'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_ge','nerate faster code (default)'#000+
+  '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
-  '3*2O1_level 1 optimizations (quick optimizations)'#000+
-  '3*2O2_level 2 optimizations (-O1 + slower optimization','s)'#000+
+  '3*2O1_level 1 optimizations (quick optimi','zations)'#000+
+  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
   '3*2Op_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
-  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
+  '3*3Op3_set tar','get processor to PPro/PII/c6x86/K6 (tm)'#000+
   '6*1A_output format'#000+
   '6*1A_output format'#000+
-  '6*2A','o_Unix o-file using GNU AS'#000+
+  '6*2Ao_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
   '6*2Agas_GNU Motorola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations'#000+
   '6*1O_optimizations'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Oa_turn on the optimizer'#000+
-  '6*2Og_generate smaller code'#000+
+  '6*2Og_g','enerate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2OG_generate faster code (default)'#000+
-  '6*2Ox','_optimize maximum (still BUGGY!!!)'#000+
+  '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '**1*_'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
   '**1?_shows this help'#000+

+ 9 - 4
compiler/parser.pas

@@ -137,7 +137,7 @@ unit parser;
          oldaktasmmode      : tasmmode;
          oldaktasmmode      : tasmmode;
 
 
 {$ifdef usebrowser}
 {$ifdef usebrowser}
-{$ifdef debug}
+{$ifdef dummydebug}
          hp : pmodule;
          hp : pmodule;
 {$endif debug}
 {$endif debug}
 {$endif usebrowser}
 {$endif usebrowser}
@@ -361,14 +361,14 @@ unit parser;
              end;
              end;
 {$ifdef UseBrowser}
 {$ifdef UseBrowser}
           { Write Browser }
           { Write Browser }
-{$ifdef debug}
+{$ifdef dummydebug}
             hp:=pmodule(loaded_units.first);
             hp:=pmodule(loaded_units.first);
             while assigned(hp) do
             while assigned(hp) do
               begin
               begin
                  writeln('Unit ',hp^.modulename^,' has index ',hp^.unit_index);
                  writeln('Unit ',hp^.modulename^,' has index ',hp^.unit_index);
                  hp:=pmodule(hp^.next);
                  hp:=pmodule(hp^.next);
               end;
               end;
-{$endif debug}
+{$endif dummydebug}
             if cs_browser in aktmoduleswitches then
             if cs_browser in aktmoduleswitches then
               if Browse.elements_to_list^.empty then
               if Browse.elements_to_list^.empty then
                 begin
                 begin
@@ -386,7 +386,12 @@ unit parser;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.48  1998-09-22 17:13:48  pierre
+  Revision 1.49  1998-09-23 15:39:07  pierre
+    * browser bugfixes
+      was adding a reference when looking for the symbol
+      if -bSYM_NAME was used
+
+  Revision 1.48  1998/09/22 17:13:48  pierre
     + browsing updated and developed
     + browsing updated and developed
       records and objects fields are also stored
       records and objects fields are also stored
 
 

+ 9 - 3
compiler/pbase.pas

@@ -180,11 +180,11 @@ unit pbase;
          filepos : tfileposinfo;
          filepos : tfileposinfo;
          ss : pvarsym;
          ss : pvarsym;
       begin
       begin
+         filepos:=tokenpos;
          while not sc^.empty do
          while not sc^.empty do
            begin
            begin
-              s:=sc^.get_with_tokeninfo(filepos);
+              s:=sc^.get_with_tokeninfo(tokenpos);
               ss:=new(pvarsym,init(s,def));
               ss:=new(pvarsym,init(s,def));
-              ss^.fileinfo:=filepos;
               st^.insert(ss);
               st^.insert(ss);
               { static data fields are inserted in the globalsymtable }
               { static data fields are inserted in the globalsymtable }
               if (st^.symtabletype=objectsymtable) and
               if (st^.symtabletype=objectsymtable) and
@@ -196,13 +196,19 @@ unit pbase;
 
 
            end;
            end;
          dispose(sc,done);
          dispose(sc,done);
+         tokenpos:=filepos;
       end;
       end;
 
 
 end.
 end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.15  1998-09-07 23:10:21  florian
+  Revision 1.16  1998-09-23 15:39:08  pierre
+    * browser bugfixes
+      was adding a reference when looking for the symbol
+      if -bSYM_NAME was used
+
+  Revision 1.15  1998/09/07 23:10:21  florian
     * a lot of stuff fixed regarding rtti and publishing of properties,
     * a lot of stuff fixed regarding rtti and publishing of properties,
       basics should now work
       basics should now work
 
 

+ 36 - 13
compiler/pdecl.pas

@@ -80,6 +80,7 @@ unit pdecl;
          p : ptree;
          p : ptree;
          def : pdef;
          def : pdef;
          sym : psym;
          sym : psym;
+         storetokenpos,filepos : tfileposinfo;
          ps : pconstset;
          ps : pconstset;
          pd : pbestreal;
          pd : pbestreal;
 {$ifdef USEANSISTRING}
 {$ifdef USEANSISTRING}
@@ -91,6 +92,7 @@ unit pdecl;
          consume(_CONST);
          consume(_CONST);
          repeat
          repeat
            name:=pattern;
            name:=pattern;
+           filepos:=tokenpos;
            consume(ID);
            consume(ID);
            case token of
            case token of
               EQUAL:
               EQUAL:
@@ -98,6 +100,8 @@ unit pdecl;
                    consume(EQUAL);
                    consume(EQUAL);
                    p:=comp_expr(true);
                    p:=comp_expr(true);
                    do_firstpass(p);
                    do_firstpass(p);
+                   storetokenpos:=tokenpos;
+                   tokenpos:=filepos;
                    case p^.treetype of
                    case p^.treetype of
                       ordconstn:
                       ordconstn:
                         begin
                         begin
@@ -136,6 +140,7 @@ unit pdecl;
                                    end;
                                    end;
                       else Message(cg_e_illegal_expression);
                       else Message(cg_e_illegal_expression);
                    end;
                    end;
+                   tokenpos:=storetokenpos;
                    consume(SEMICOLON);
                    consume(SEMICOLON);
                    disposetree(p);
                    disposetree(p);
                 end;
                 end;
@@ -150,7 +155,10 @@ unit pdecl;
                    def:=read_type('');
                    def:=read_type('');
                    block_type:=bt_general;
                    block_type:=bt_general;
                    ignore_equal:=false;
                    ignore_equal:=false;
+                   storetokenpos:=tokenpos;
+                   tokenpos:=filepos;
                    sym:=new(ptypedconstsym,init(name,def));
                    sym:=new(ptypedconstsym,init(name,def));
+                   tokenpos:=storetokenpos;
                    symtablestack^.insert(sym);
                    symtablestack^.insert(sym);
                    consume(EQUAL);
                    consume(EQUAL);
                    readtypedconst(def,ptypedconstsym(sym));
                    readtypedconst(def,ptypedconstsym(sym));
@@ -198,7 +206,7 @@ unit pdecl;
          sc : pstringcontainer;
          sc : pstringcontainer;
          s : stringid;
          s : stringid;
          old_block_type : tblock_type;
          old_block_type : tblock_type;
-         filepos : tfileposinfo;
+         declarepos,storetokenpos : tfileposinfo;
          symdone : boolean;
          symdone : boolean;
          { to handle absolute }
          { to handle absolute }
          abssym : pabsolutesym;
          abssym : pabsolutesym;
@@ -246,12 +254,13 @@ unit pdecl;
              symdone:=false;
              symdone:=false;
              if is_gpc_name then
              if is_gpc_name then
                begin
                begin
-                  s:=sc^.get_with_tokeninfo(filepos);
+                  storetokenpos:=tokenpos;
+                  s:=sc^.get_with_tokeninfo(tokenpos);
                   if not sc^.empty then
                   if not sc^.empty then
                    Message(parser_e_absolute_only_one_var);
                    Message(parser_e_absolute_only_one_var);
                   dispose(sc,done);
                   dispose(sc,done);
                   Csym:=new(pvarsym,init_C(s,target_os.Cprefix+C_name,p));
                   Csym:=new(pvarsym,init_C(s,target_os.Cprefix+C_name,p));
-                  Csym^.fileinfo:=filepos;
+                  tokenpos:=storetokenpos;
                   Csym^.var_options:=Csym^.var_options or vo_is_external;
                   Csym^.var_options:=Csym^.var_options or vo_is_external;
                   externals^.concat(new(pai_external,init(Csym^.mangledname,EXT_NEAR)));
                   externals^.concat(new(pai_external,init(Csym^.mangledname,EXT_NEAR)));
                   symtablestack^.insert(Csym);
                   symtablestack^.insert(Csym);
@@ -263,7 +272,7 @@ unit pdecl;
               begin
               begin
                 consume(ID);
                 consume(ID);
               { only allowed for one var }
               { only allowed for one var }
-                s:=sc^.get_with_tokeninfo(filepos);
+                s:=sc^.get_with_tokeninfo(declarepos);
                 if not sc^.empty then
                 if not sc^.empty then
                  Message(parser_e_absolute_only_one_var);
                  Message(parser_e_absolute_only_one_var);
                 dispose(sc,done);
                 dispose(sc,done);
@@ -275,23 +284,28 @@ unit pdecl;
                    { we should check the result type of srsym }
                    { we should check the result type of srsym }
                    if not (srsym^.typ in [varsym,typedconstsym]) then
                    if not (srsym^.typ in [varsym,typedconstsym]) then
                      Message(parser_e_absolute_only_to_var_or_const);
                      Message(parser_e_absolute_only_to_var_or_const);
+
+                   storetokenpos:=tokenpos;
+                   tokenpos:=declarepos;
                    abssym:=new(pabsolutesym,init(s,p));
                    abssym:=new(pabsolutesym,init(s,p));
                    abssym^.typ:=absolutesym;
                    abssym^.typ:=absolutesym;
                    abssym^.abstyp:=tovar;
                    abssym^.abstyp:=tovar;
                    abssym^.ref:=srsym;
                    abssym^.ref:=srsym;
-                   abssym^.fileinfo:=filepos;
+                   tokenpos:=storetokenpos;
                    symtablestack^.insert(abssym);
                    symtablestack^.insert(abssym);
                  end
                  end
                 else
                 else
                  if token=CSTRING then
                  if token=CSTRING then
                   begin
                   begin
+                    storetokenpos:=tokenpos;
+                    tokenpos:=declarepos;
                     abssym:=new(pabsolutesym,init(s,p));
                     abssym:=new(pabsolutesym,init(s,p));
                     s:=pattern;
                     s:=pattern;
                     consume(CSTRING);
                     consume(CSTRING);
                     abssym^.typ:=absolutesym;
                     abssym^.typ:=absolutesym;
                     abssym^.abstyp:=toasm;
                     abssym^.abstyp:=toasm;
                     abssym^.asmname:=stringdup(s);
                     abssym^.asmname:=stringdup(s);
-                    abssym^.fileinfo:=filepos;
+                    tokenpos:=storetokenpos;
                     symtablestack^.insert(abssym);
                     symtablestack^.insert(abssym);
                   end
                   end
                 else
                 else
@@ -301,11 +315,13 @@ unit pdecl;
 {$ifdef i386}
 {$ifdef i386}
                     if (target_info.target=target_GO32V2) then
                     if (target_info.target=target_GO32V2) then
                      begin
                      begin
+                       storetokenpos:=tokenpos;
+                       tokenpos:=declarepos;
                        abssym:=new(pabsolutesym,init(s,p));
                        abssym:=new(pabsolutesym,init(s,p));
                        abssym^.typ:=absolutesym;
                        abssym^.typ:=absolutesym;
                        abssym^.abstyp:=toaddr;
                        abssym^.abstyp:=toaddr;
                        abssym^.absseg:=false;
                        abssym^.absseg:=false;
-                       abssym^.fileinfo:=filepos;
+                       tokenpos:=storetokenpos;
                        s:=pattern;
                        s:=pattern;
                        consume(INTCONST);
                        consume(INTCONST);
                        val(s,abssym^.address,code);
                        val(s,abssym^.address,code);
@@ -351,7 +367,7 @@ unit pdecl;
                     (pattern='CVAR')) then
                     (pattern='CVAR')) then
                  begin
                  begin
                    { only allowed for one var }
                    { only allowed for one var }
-                   s:=sc^.get_with_tokeninfo(filepos);
+                   s:=sc^.get_with_tokeninfo(declarepos);
                    if not sc^.empty then
                    if not sc^.empty then
                     Message(parser_e_absolute_only_one_var);
                     Message(parser_e_absolute_only_one_var);
                    dispose(sc,done);
                    dispose(sc,done);
@@ -400,8 +416,10 @@ unit pdecl;
                    if extern_csym or export_csym then
                    if extern_csym or export_csym then
                     consume(SEMICOLON);
                     consume(SEMICOLON);
                    { insert in the symtable }
                    { insert in the symtable }
+                   storetokenpos:=tokenpos;
+                   tokenpos:=declarepos;
                    Csym:=new(pvarsym,init_C(s,C_name,p));
                    Csym:=new(pvarsym,init_C(s,C_name,p));
-                   Csym^.fileinfo:=filepos;
+                   tokenpos:=storetokenpos;
                    if export_Csym then
                    if export_Csym then
                     inc(Csym^.refs);
                     inc(Csym^.refs);
                    if extern_Csym then
                    if extern_Csym then
@@ -702,7 +720,7 @@ unit pdecl;
            sc : pstringcontainer;
            sc : pstringcontainer;
            hp : pdef;
            hp : pdef;
            s : string;
            s : string;
-           filepos : tfileposinfo;
+           declarepos : tfileposinfo;
            pp : pprocdef;
            pp : pprocdef;
            pt : ptree;
            pt : ptree;
            propname : stringid;
            propname : stringid;
@@ -766,7 +784,7 @@ unit pdecl;
                          end
                          end
                        else
                        else
                          hp:=new(pformaldef,init);
                          hp:=new(pformaldef,init);
-                       s:=sc^.get_with_tokeninfo(filepos);
+                       s:=sc^.get_with_tokeninfo(declarepos);
                        while s<>'' do
                        while s<>'' do
                          begin
                          begin
                             new(hp2);
                             new(hp2);
@@ -774,7 +792,7 @@ unit pdecl;
                             hp2^.data:=hp;
                             hp2^.data:=hp;
                             hp2^.next:=propertyparas;
                             hp2^.next:=propertyparas;
                             propertyparas:=hp2;
                             propertyparas:=hp2;
-                            s:=sc^.get_with_tokeninfo(filepos);
+                            s:=sc^.get_with_tokeninfo(declarepos);
                          end;
                          end;
                        dispose(sc,done);
                        dispose(sc,done);
                        if token=SEMICOLON then consume(SEMICOLON)
                        if token=SEMICOLON then consume(SEMICOLON)
@@ -2038,7 +2056,12 @@ unit pdecl;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.55  1998-09-21 13:24:44  daniel
+  Revision 1.56  1998-09-23 15:39:09  pierre
+    * browser bugfixes
+      was adding a reference when looking for the symbol
+      if -bSYM_NAME was used
+
+  Revision 1.55  1998/09/21 13:24:44  daniel
   * Memory leak fixed.
   * Memory leak fixed.
 
 
   Revision 1.54  1998/09/17 13:41:16  pierre
   Revision 1.54  1998/09/17 13:41:16  pierre

+ 10 - 2
compiler/ppu.pas

@@ -194,7 +194,8 @@ type
 
 
 implementation
 implementation
 
 
-
+uses
+  verbose;
 {*****************************************************************************
 {*****************************************************************************
                                    Crc 32
                                    Crc 32
 *****************************************************************************}
 *****************************************************************************}
@@ -393,6 +394,8 @@ begin
   blockread(f,buf^,ppubufsize,bufsize);
   blockread(f,buf^,ppubufsize,bufsize);
 {$endif}
 {$endif}
   bufidx:=0;
   bufidx:=0;
+  if bufsize=0 then
+    Message(unit_f_ppu_read_unexpected_end);
 end;
 end;
 
 
 
 
@@ -776,7 +779,12 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.14  1998-09-21 10:00:07  peter
+  Revision 1.15  1998-09-23 15:39:10  pierre
+    * browser bugfixes
+      was adding a reference when looking for the symbol
+      if -bSYM_NAME was used
+
+  Revision 1.14  1998/09/21 10:00:07  peter
     * store number of defs in ppu file
     * store number of defs in ppu file
 
 
   Revision 1.13  1998/09/21 08:45:18  pierre
   Revision 1.13  1998/09/21 08:45:18  pierre

+ 7 - 2
compiler/symsym.inc

@@ -34,7 +34,7 @@
 {$ifdef GDB}
 {$ifdef GDB}
          isstabwritten := false;
          isstabwritten := false;
 {$endif GDB}
 {$endif GDB}
-         fileinfo:=aktfilepos;
+         fileinfo:=tokenpos;
 {$ifdef UseBrowser}
 {$ifdef UseBrowser}
          defref:=nil;
          defref:=nil;
          lastwritten:=nil;
          lastwritten:=nil;
@@ -1717,7 +1717,12 @@
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.45  1998-09-21 08:45:24  pierre
+  Revision 1.46  1998-09-23 15:39:13  pierre
+    * browser bugfixes
+      was adding a reference when looking for the symbol
+      if -bSYM_NAME was used
+
+  Revision 1.45  1998/09/21 08:45:24  pierre
     + added vmt_offset in tobjectdef.write for fututre use
     + added vmt_offset in tobjectdef.write for fututre use
       (first steps to have objects without vmt if no virtual !!)
       (first steps to have objects without vmt if no virtual !!)
     + added fpu_used field for tabstractprocdef  :
     + added fpu_used field for tabstractprocdef  :