mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-08 10:48:12 +02:00
* updated messages file
This commit is contained in:
parent
28f036c698
commit
c9715847f6
@ -1280,7 +1280,7 @@ end;
|
||||
end
|
||||
else
|
||||
begin
|
||||
Comment(V_Error,'Unsupported symbol type for operand');
|
||||
Message(assem_e_unsupported_symbol_type);
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
@ -1324,7 +1324,7 @@ end;
|
||||
end;
|
||||
else
|
||||
begin
|
||||
Comment(V_Error,'Unsupported symbol type for operand');
|
||||
Message(assem_e_unsupported_symbol_type);
|
||||
exit;
|
||||
end;
|
||||
end; { case }
|
||||
@ -1393,7 +1393,7 @@ end;
|
||||
end;
|
||||
else
|
||||
begin
|
||||
Comment(V_Error,'Unsupported symbol type for operand');
|
||||
Message(assem_e_unsupported_symbol_type);
|
||||
exit;
|
||||
end;
|
||||
end; {case}
|
||||
@ -1628,7 +1628,10 @@ end;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 1998-06-04 23:51:31 peter
|
||||
Revision 1.5 1998-07-14 21:46:38 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.4 1998/06/04 23:51:31 peter
|
||||
* m68k compiles
|
||||
+ .def file creation moved to gendef.pas so it could also be used
|
||||
for win32
|
||||
|
@ -222,7 +222,7 @@ procedure TAsmList.NextSmartName;
|
||||
begin
|
||||
inc(SmartLinkFilesCnt);
|
||||
if SmartLinkFilesCnt>999999 then
|
||||
Comment(V_Fatal,'Too many assembler files');
|
||||
Message(assem_f_too_many_asm_files);
|
||||
AsmFile:=Path+FixFileName('as'+tostr(SmartLinkFilesCnt)+target_info.asmext);
|
||||
ObjFile:=Path+FixFileName('as'+tostr(SmartLinkFilesCnt)+target_info.objext);
|
||||
end;
|
||||
@ -427,7 +427,7 @@ begin
|
||||
{$endif NoAg86KMot}
|
||||
{$endif}
|
||||
else
|
||||
Comment(V_Fatal,'Selected assembler output not supported!');
|
||||
Message(assem_f_assembler_output_not_supported);
|
||||
end;
|
||||
a^.AsmCreate;
|
||||
a^.WriteAsmList;
|
||||
@ -450,7 +450,10 @@ end;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.12 1998-07-08 14:58:34 daniel
|
||||
Revision 1.13 1998-07-14 21:46:40 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.12 1998/07/08 14:58:34 daniel
|
||||
* First check if call to assembler is succesfull, then check it's exit code.
|
||||
This is more logical than first checking the exit code. For some mysterious
|
||||
reason this did not give problems on DOS & Linux. On OS/2 it did.
|
||||
|
@ -58,6 +58,7 @@ general_i_targetos,
|
||||
general_u_exepath,
|
||||
general_u_gcclibpath,
|
||||
general_i_abslines_compiled,
|
||||
general_f_no_memory_left,
|
||||
{
|
||||
Scanner part
|
||||
}
|
||||
@ -102,6 +103,8 @@ scan_c_skipping_until,
|
||||
scan_i_press_enter,
|
||||
scan_w_unsupported_switch,
|
||||
scan_w_illegal_directive,
|
||||
scan_d_back_in,
|
||||
scan_w_unsupported_asmmode_specifier,
|
||||
{
|
||||
Parser
|
||||
}
|
||||
@ -204,6 +207,18 @@ parser_e_constructor_cannot_be_not_virtual,
|
||||
parser_e_no_default_property_available,
|
||||
parser_e_cant_have_published,
|
||||
parser_forward_declaration_must_be_resolved,
|
||||
parser_e_no_local_operator,
|
||||
parser_e_proc_dir_not_allowed_in_interface,
|
||||
parser_e_proc_dir_not_allowed_in_implementation,
|
||||
parser_e_proc_dir_not_allowed_in_procvar,
|
||||
parser_e_function_already_declared_public_forward,
|
||||
parser_e_not_external_and_export,
|
||||
parser_e_name_keyword_expected,
|
||||
parser_w_not_supported_for_inline,
|
||||
parser_w_inlining_disabled,
|
||||
parser_i_writing_browser_log,
|
||||
parser_h_maybe_deref_caret_missing,
|
||||
parser_f_assembler_reader_not_supported,
|
||||
{
|
||||
Symbol table
|
||||
}
|
||||
@ -270,6 +285,9 @@ cg_f_internal_error_in_secondinline,
|
||||
cg_d_register_weight,
|
||||
cg_e_stacklimit_in_local_routine,
|
||||
cg_d_stackframe_omited,
|
||||
cg_e_unable_inline_object_methods,
|
||||
cg_e_unable_inline_procvar,
|
||||
cg_e_no_code_for_inline_stored,
|
||||
{
|
||||
Assembler parsers
|
||||
}
|
||||
@ -409,6 +427,9 @@ assem_f_invalid_suffix_intel,
|
||||
assem_e_extended_not_supported,
|
||||
assem_e_comp_not_supported,
|
||||
assem_w_mmxwarning_as_281,
|
||||
assem_f_too_many_asm_files,
|
||||
assem_f_assembler_output_not_supported,
|
||||
assem_e_unsupported_symbol_type,
|
||||
{
|
||||
Exec, assembler, linker, binder calls
|
||||
}
|
||||
|
1903
compiler/msgtxt.inc
1903
compiler/msgtxt.inc
File diff suppressed because it is too large
Load Diff
@ -299,7 +299,11 @@ done:
|
||||
{$endif Splitheap}
|
||||
|
||||
{ restore old state, close trees }
|
||||
{$ifndef go32v2}
|
||||
{$ifndef linux}
|
||||
if dispose_asm_lists then
|
||||
{$endif}
|
||||
{$endif}
|
||||
codegen_donemodule;
|
||||
|
||||
{$ifdef GDB}
|
||||
@ -372,7 +376,7 @@ done:
|
||||
{ Write Browser }
|
||||
if cs_browser in initswitches then
|
||||
begin
|
||||
Comment(V_Info,'Writing Browser '+Browse.Fname);
|
||||
Message1(parser_i_writing_browser_log,Browse.Fname);
|
||||
Browse.CreateLog;
|
||||
write_browser_log;
|
||||
Browse.CloseLog;
|
||||
@ -386,7 +390,10 @@ done:
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.30 1998-07-14 14:46:49 peter
|
||||
Revision 1.31 1998-07-14 21:46:46 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.30 1998/07/14 14:46:49 peter
|
||||
* released NEWINPUT
|
||||
|
||||
Revision 1.29 1998/07/07 11:19:59 peter
|
||||
|
@ -3303,16 +3303,16 @@ unit pass_1;
|
||||
if (p^.procdefinition^.options and poinline)<>0 then
|
||||
begin
|
||||
if assigned(p^.methodpointer) then
|
||||
comment(v_fatal,'Unable to inline object methods');
|
||||
Message(cg_e_unable_inline_object_methods);
|
||||
if assigned(p^.right) and (p^.right^.treetype<>procinlinen) then
|
||||
comment(v_fatal,'Unable to inline procvar calls');
|
||||
Message(cg_e_unable_inline_procvar);
|
||||
{ p^.treetype:=procinlinen; }
|
||||
if not assigned(p^.right) then
|
||||
begin
|
||||
if assigned(p^.procdefinition^.code) then
|
||||
inlinecode:=genprocinlinenode(p,ptree(p^.procdefinition^.code))
|
||||
else
|
||||
comment(v_fatal,'no code for inline procedure stored');
|
||||
Message(cg_e_no_code_for_inline_stored);
|
||||
if assigned(inlinecode) then
|
||||
begin
|
||||
{ consider it has not inlined if called
|
||||
@ -3321,7 +3321,6 @@ unit pass_1;
|
||||
firstpass(inlinecode);
|
||||
inlined:=true;
|
||||
end;
|
||||
|
||||
end;
|
||||
end
|
||||
else
|
||||
@ -5041,7 +5040,10 @@ unit pass_1;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.38 1998-07-14 14:46:50 peter
|
||||
Revision 1.39 1998-07-14 21:46:47 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.38 1998/07/14 14:46:50 peter
|
||||
* released NEWINPUT
|
||||
|
||||
Revision 1.37 1998/07/07 12:31:44 peter
|
||||
|
@ -35,6 +35,7 @@ unit pbase;
|
||||
|
||||
{ true, if we are after an assignement }
|
||||
afterassignment : boolean = false;
|
||||
|
||||
{ sspecial for handling procedure vars }
|
||||
getprocvar : boolean = false;
|
||||
getprocvardef : pprocvardef = nil;
|
||||
@ -54,8 +55,7 @@ unit pbase;
|
||||
{ symtable were unit references are stored }
|
||||
refsymtable : psymtable;
|
||||
|
||||
{ true, if only routine headers should be }
|
||||
{ parsed }
|
||||
{ true, if only routine headers should be parsed }
|
||||
parse_only : boolean;
|
||||
|
||||
{ true, if we are in a except block }
|
||||
@ -64,6 +64,7 @@ unit pbase;
|
||||
{ true, if we should ignore an equal in const x : 1..2=2 }
|
||||
ignore_equal : boolean;
|
||||
|
||||
|
||||
{ consumes token i, if the current token is unequal i }
|
||||
{ a syntax error is written }
|
||||
procedure consume(i : ttoken);
|
||||
@ -87,29 +88,18 @@ unit pbase;
|
||||
var
|
||||
last_endtoken_filepos: tfileposinfo;
|
||||
|
||||
|
||||
implementation
|
||||
|
||||
uses
|
||||
|
||||
files,scanner,systems,verbose;
|
||||
|
||||
{ generates a syntax error message }
|
||||
procedure syntaxerror(s : string);
|
||||
|
||||
begin
|
||||
Message2(scan_f_syn_expected,tostr(aktfilepos.column),s);
|
||||
end;
|
||||
|
||||
{ This is changed since I changed the order of token
|
||||
in cobjects.pas for operator overloading !!!! }
|
||||
{ ttoken = (PLUS,MINUS,STAR,SLASH,EQUAL,GT,
|
||||
LT,LTE,GTE,SYMDIF,STARSTAR,ASSIGNMENT,CARET,
|
||||
LECKKLAMMER,RECKKLAMMER,
|
||||
POINT,COMMA,LKLAMMER,RKLAMMER,COLON,SEMICOLON,
|
||||
KLAMMERAFFE,UNEQUAL,POINTPOINT,
|
||||
ID,REALNUMBER,_EOF,INTCONST,CSTRING,CCHAR,DOUBLEADDR,}
|
||||
|
||||
|
||||
const tokens : array[PLUS..DOUBLEADDR] of string[12] = (
|
||||
'+','-','*','/','=','>','<','>=','<=','is','as','in',
|
||||
'><','**',':=','^','<>','[',']','.',',','(',')',':',';',
|
||||
@ -118,45 +108,35 @@ unit pbase;
|
||||
'ord const','const string','const char','@@');
|
||||
|
||||
function tokenstring(i : ttoken) : string;
|
||||
|
||||
var
|
||||
j : integer;
|
||||
|
||||
j : longint;
|
||||
begin
|
||||
if i<_AND then
|
||||
tokenstring:=tokens[i]
|
||||
else
|
||||
begin
|
||||
{ um die ProgrammgrӇe klein zu halten, }
|
||||
{ wird f<>r ein Schl<68>sselwort-Token der }
|
||||
{ "Text" in der Schl<68>sselworttabelle }
|
||||
{ des Scanners nachgeschaut }
|
||||
|
||||
for j:=1 to anz_keywords do
|
||||
if keyword_token[j]=i then
|
||||
tokenstring:=keyword[j];
|
||||
for j:=1 to anz_keywords do
|
||||
if keyword_token[j]=i then
|
||||
tokenstring:=keyword[j];
|
||||
end;
|
||||
end;
|
||||
|
||||
{ consumes token i, if the current token is unequal i }
|
||||
{ a syntax error is written }
|
||||
|
||||
{ consumes token i, write error if token is different }
|
||||
procedure consume(i : ttoken);
|
||||
|
||||
begin
|
||||
if token<>i then
|
||||
begin
|
||||
syntaxerror(tokenstring(i));
|
||||
end
|
||||
else
|
||||
begin
|
||||
if token=_END then
|
||||
last_endtoken_filepos:=tokenpos;
|
||||
token:=current_scanner^.yylex;
|
||||
end;
|
||||
if token<>i then
|
||||
Message1(scan_f_syn_expected,tokenstring(i))
|
||||
else
|
||||
begin
|
||||
if token=_END then
|
||||
last_endtoken_filepos:=tokenpos;
|
||||
token:=current_scanner^.yylex;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
procedure consume_all_until(atoken : ttoken);
|
||||
|
||||
begin
|
||||
while (token<>atoken) and (token<>_EOF) do
|
||||
consume(token);
|
||||
@ -167,19 +147,18 @@ unit pbase;
|
||||
Message(scan_f_end_of_file);
|
||||
end;
|
||||
|
||||
procedure emptystats;
|
||||
|
||||
procedure emptystats;
|
||||
begin
|
||||
while token=SEMICOLON do
|
||||
consume(SEMICOLON);
|
||||
end;
|
||||
|
||||
|
||||
{ reads a list of identifiers into a string container }
|
||||
function idlist : pstringcontainer;
|
||||
|
||||
var
|
||||
sc : pstringcontainer;
|
||||
|
||||
begin
|
||||
sc:=new(pstringcontainer,init);
|
||||
repeat
|
||||
@ -192,16 +171,14 @@ unit pbase;
|
||||
idlist:=sc;
|
||||
end;
|
||||
|
||||
|
||||
{ inserts the symbols of sc in st with def as definition }
|
||||
{ sc is disposed }
|
||||
procedure insert_syms(st : psymtable;sc : pstringcontainer;def : pdef);
|
||||
|
||||
var
|
||||
s : string;
|
||||
filepos : tfileposinfo;
|
||||
ss : pvarsym;
|
||||
|
||||
|
||||
begin
|
||||
while not sc^.empty do
|
||||
begin
|
||||
@ -224,7 +201,10 @@ end.
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.13 1998-07-14 14:46:52 peter
|
||||
Revision 1.14 1998-07-14 21:46:49 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.13 1998/07/14 14:46:52 peter
|
||||
* released NEWINPUT
|
||||
|
||||
Revision 1.12 1998/07/09 23:59:59 peter
|
||||
|
@ -330,7 +330,7 @@ unit pdecl;
|
||||
begin
|
||||
consume(ID);
|
||||
if extern_csym then
|
||||
Comment(V_Error,'can''t use both EXPORT and EXTERNAL')
|
||||
Message(parser_e_not_external_and_export)
|
||||
else
|
||||
export_Csym:=true;
|
||||
end;
|
||||
@ -340,7 +340,7 @@ unit pdecl;
|
||||
if (token=ID) and (pattern='NAME') then
|
||||
consume(ID)
|
||||
else
|
||||
Comment(V_Error,'NAME keyword expected');
|
||||
Message(parser_e_name_keyword_expected);
|
||||
C_name:=pattern;
|
||||
{ allow also char }
|
||||
if token=CCHAR then
|
||||
@ -1791,8 +1791,8 @@ unit pdecl;
|
||||
if assigned(aktprocsym) and
|
||||
((aktprocsym^.definition^.options and poinline)<>0) then
|
||||
Begin
|
||||
Comment(V_Warning,tokenstring(t)+' not yet supported inside inline procedure/function ');
|
||||
Comment(V_Warning,'inlining disabled');
|
||||
Message1(parser_w_not_supported_for_inline,tokenstring(t));
|
||||
Message(parser_w_inlining_disabled);
|
||||
aktprocsym^.definition^.options:= aktprocsym^.definition^.options and not poinline;
|
||||
End;
|
||||
end;
|
||||
@ -1864,7 +1864,10 @@ unit pdecl;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.31 1998-07-14 14:46:53 peter
|
||||
Revision 1.32 1998-07-14 21:46:50 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.31 1998/07/14 14:46:53 peter
|
||||
* released NEWINPUT
|
||||
|
||||
Revision 1.30 1998/07/10 00:00:00 peter
|
||||
|
@ -845,9 +845,7 @@ unit pexpr;
|
||||
in [recorddef,objectdef,classrefdef] then
|
||||
begin
|
||||
Message(cg_e_invalid_qualifier);
|
||||
{ exterror:=strpnew(' may be pointer deref ^ is missing');
|
||||
error(invalid_qualifizier); }
|
||||
Comment(V_hint,' may be pointer deref ^ is missing');
|
||||
Message(parser_h_maybe_deref_caret_missing);
|
||||
end
|
||||
else
|
||||
Message(cg_e_invalid_qualifier);
|
||||
@ -1787,7 +1785,10 @@ unit pexpr;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.27 1998-06-25 14:04:23 peter
|
||||
Revision 1.28 1998-07-14 21:46:51 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.27 1998/06/25 14:04:23 peter
|
||||
+ internal inc/dec
|
||||
|
||||
Revision 1.26 1998/06/09 16:01:46 pierre
|
||||
|
@ -595,8 +595,8 @@ unit pstatmnt;
|
||||
begin
|
||||
if (aktprocsym^.definition^.options and poinline)<>0 then
|
||||
Begin
|
||||
Comment(V_Warning,'asm statement inside inline procedure/function not yet supported');
|
||||
Comment(V_Warning,'inlining disabled');
|
||||
Message1(parser_w_not_supported_for_inline,'asm statement');
|
||||
Message(parser_w_inlining_disabled);
|
||||
aktprocsym^.definition^.options:= aktprocsym^.definition^.options and not poinline;
|
||||
End;
|
||||
case aktasmmode of
|
||||
@ -617,7 +617,7 @@ unit pstatmnt;
|
||||
{$endif NoRA68kMot}
|
||||
{$endif}
|
||||
else
|
||||
Comment(V_Fatal,'Selected assembler reader not supported');
|
||||
Message(parser_f_assembler_reader_not_supported);
|
||||
end;
|
||||
|
||||
{ Read first the _ASM statement }
|
||||
@ -1168,7 +1168,10 @@ unit pstatmnt;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.24 1998-07-10 10:48:42 peter
|
||||
Revision 1.25 1998-07-14 21:46:53 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.24 1998/07/10 10:48:42 peter
|
||||
* fixed realnumber scanning
|
||||
* [] after asmblock was not uppercased anymore
|
||||
|
||||
|
@ -549,7 +549,7 @@ const
|
||||
if upcase(c)='N' then
|
||||
begin
|
||||
hs:=current_scanner^.readid;
|
||||
if hs='NORMAL' then
|
||||
if (hs='NORMAL') or (hs='DEFAULT') then
|
||||
aktpackrecords:=2
|
||||
else
|
||||
Message(scan_w_only_pack_records);
|
||||
@ -560,6 +560,7 @@ const
|
||||
1 : aktpackrecords:=1;
|
||||
2 : aktpackrecords:=2;
|
||||
4 : aktpackrecords:=4;
|
||||
16 : aktpackrecords:=16;
|
||||
else
|
||||
Message(scan_w_only_pack_records);
|
||||
end;
|
||||
@ -582,7 +583,7 @@ const
|
||||
aktasmmode:=initasmmode
|
||||
else
|
||||
if not set_string_asmmode(s,aktasmmode) then
|
||||
Comment(V_Warning,'Unsupported asm mode specified '+s);
|
||||
Message1(scan_w_unsupported_asmmode_specifier,s);
|
||||
end;
|
||||
|
||||
procedure dir_oldasmmode(t:tdirectivetoken);
|
||||
@ -705,7 +706,10 @@ const
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.14 1998-07-14 14:47:03 peter
|
||||
Revision 1.15 1998-07-14 21:46:55 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.14 1998/07/14 14:47:03 peter
|
||||
* released NEWINPUT
|
||||
|
||||
Revision 1.13 1998/07/07 12:32:54 peter
|
||||
|
@ -837,7 +837,7 @@ unit tree;
|
||||
getmem(pc,p^.length+1);
|
||||
{ Peter can you change that ? }
|
||||
if pc=nil then
|
||||
comment(V_fatal,'No memory left');
|
||||
Message(general_f_no_memory_left);
|
||||
move(p^.values^,pc^,p^.length+1);
|
||||
getpcharcopy:=pc;
|
||||
end;
|
||||
@ -1595,7 +1595,10 @@ unit tree;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.20 1998-07-14 14:47:11 peter
|
||||
Revision 1.21 1998-07-14 21:46:56 peter
|
||||
* updated messages file
|
||||
|
||||
Revision 1.20 1998/07/14 14:47:11 peter
|
||||
* released NEWINPUT
|
||||
|
||||
Revision 1.19 1998/07/08 14:56:53 daniel
|
||||
|
Loading…
Reference in New Issue
Block a user