* patch by Marģers to unify internal error numbers, resolves #37888

git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@47103 3ad0048d-3df7-0310-abae-a5850022a9f2

7 files changed, 16 insertions, 16 deletions

diff --git a/compiler/jvm/agjasmin.pas b/compiler/jvm/agjasmin.pas
index bdffd19a25..58ed55ac42 100644
--- a/compiler/jvm/agjasmin.pas
+++ b/compiler/jvm/agjasmin.pas
@@ -865,7 +865,7 @@ implementation
         kindname: ansistring;
       begin
         if not(obj.owner.defowner.typ in [objectdef,recorddef]) then
-          internalerror(2011021701);
+          internalerror(2011021704);
         { Nested classes in the Pascal sense are equivalent to "static"
           inner classes in Java -- will be changed when support for
           Java-style non-static classes is added }
diff --git a/compiler/jvm/hlcgcpu.pas b/compiler/jvm/hlcgcpu.pas
index afdda5b1f1..b9f4f5f8b1 100644
--- a/compiler/jvm/hlcgcpu.pas
+++ b/compiler/jvm/hlcgcpu.pas
@@ -756,7 +756,7 @@ implementation
                 end;
               end;
             else
-              internalerror(2011081801);
+              internalerror(2011081802);
           end;
         end;
     end;
@@ -843,7 +843,7 @@ implementation
               decstack(list,2);
             end;
           else
-            internalerror(2010120538);
+            internalerror(2010120505);
         end;
       end;
 
@@ -1618,7 +1618,7 @@ implementation
             s64real:
               opc:=a_dreturn;
             else
-              internalerror(2011010213);
+              internalerror(2011010202);
           end;
         else
           opc:=a_areturn;
@@ -2429,7 +2429,7 @@ implementation
         exit;
       selfpara:=tparavarsym(current_procinfo.procdef.parast.find('self'));
       if not assigned(selfpara) then
-        internalerror(2011033001);
+        internalerror(2011033002);
       selfreg:=getaddressregister(list,selfpara.vardef);
       a_load_loc_reg(list,obj,obj,selfpara.localloc,selfreg);
       cgutils.reference_reset_base(ref,selfreg,0,ctempposinvalid,1,[]);
diff --git a/compiler/jvm/jvmdef.pas b/compiler/jvm/jvmdef.pas
index 5f712c7752..658f76ed91 100644
--- a/compiler/jvm/jvmdef.pas
+++ b/compiler/jvm/jvmdef.pas
@@ -449,7 +449,7 @@ implementation
         errdef: tdef;
       begin
         if not jvmtryencodetype(def,result,false,errdef) then
-          internalerror(2011012205);
+          internalerror(2011012201);
         primitivetype:=false;
         if length(result)=1 then
           begin
@@ -463,7 +463,7 @@ implementation
               'F': result:='float';
               'D': result:='double';
               else
-                internalerror(2011012206);
+                internalerror(2011012203);
               end;
             primitivetype:=true;
           end
diff --git a/compiler/jvm/njvmcnv.pas b/compiler/jvm/njvmcnv.pas
index c4522dc197..12085d5b5b 100644
--- a/compiler/jvm/njvmcnv.pas
+++ b/compiler/jvm/njvmcnv.pas
@@ -1021,7 +1021,7 @@ implementation
           fsym:=tfieldvarsym(search_struct_member(tcpuprocvardef(fromdef).classdef,'METHOD'));
           if not assigned(fsym) or
              (fsym.typ<>fieldvarsym) then
-            internalerror(2011072414);
+            internalerror(2011072401);
           result:=csubscriptnode.create(fsym,left);
           left:=nil;
         end;
diff --git a/compiler/jvm/njvmmem.pas b/compiler/jvm/njvmmem.pas
index 098c901a15..9c608746f6 100644
--- a/compiler/jvm/njvmmem.pas
+++ b/compiler/jvm/njvmmem.pas
@@ -263,7 +263,7 @@ implementation
                   end;
               end
             else
-              internalerror(2011072506);
+              internalerror(2011072503);
           end
         else if (left.resultdef.typ=procdef) then
           begin
@@ -334,7 +334,7 @@ implementation
             vs:=search_struct_member(tobjectdef(left.resultdef),'GETCLASS');
             if not assigned(vs) or
                (tsym(vs).typ<>procsym) then
-              internalerror(2011041901);
+              internalerror(2011041903);
             result:=ccallnode.create(nil,tprocsym(vs),vs.owner,left,[],nil);
             inserttypeconv_explicit(result,resultdef);
             { reused }
@@ -391,7 +391,7 @@ implementation
             psym:=search_struct_member(tabstractrecorddef(stringclass),'CHARAT');
             if not assigned(psym) or
                (psym.typ<>procsym) then
-              internalerror(2011031501);
+              internalerror(2011031502);
             { Pascal strings are 1-based, Java strings 0-based }
             result:=ccallnode.create(ccallparanode.create(
               caddnode.create(subn,right,genintconstnode(1)),nil),tprocsym(psym),
diff --git a/compiler/jvm/njvmtcon.pas b/compiler/jvm/njvmtcon.pas
index 4aba318d87..b623d387af 100644
--- a/compiler/jvm/njvmtcon.pas
+++ b/compiler/jvm/njvmtcon.pas
@@ -197,7 +197,7 @@ implementation
                 if (tstringconstnode(n).cst_type in [cst_unicodestring,cst_widestring]) then
                   inserttypeconv(n,getansistringdef);
                   if n.nodetype<>stringconstn then
-                    internalerror(2010033003);
+                    internalerror(2010033010);
                   ca:=pbyte(tstringconstnode(n).value_str);
                 { For tp7 the maximum lentgh can be 255 }
                 if (m_tp7 in current_settings.modeswitches) and
@@ -214,7 +214,7 @@ implementation
                begin
                  inserttypeconv(n,cansichartype);
                  if not is_constcharnode(n) then
-                   internalerror(2010033001);
+                   internalerror(2010033007);
                  ch[0]:=chr(tordconstnode(n).value.uvalue and $ff);
                  ca:=@ch;
                  len:=1;
diff --git a/compiler/jvm/pjvm.pas b/compiler/jvm/pjvm.pas
index c4c7c963c6..fdae6615bb 100644
--- a/compiler/jvm/pjvm.pas
+++ b/compiler/jvm/pjvm.pas
@@ -267,11 +267,11 @@ implementation
         pd.synthetickind:=tsk_jvm_enum_fpcordinal;
         { add static class method to convert an ordinal to the corresponding enum }
         if not str_parse_method_dec('function FPCValueOf(__fpc_int: longint): __FPC_TEnumClassAlias; static;',potype_function,true,enumclass,pd) then
-          internalerror(2011062402);
+          internalerror(2011062403);
         pd.synthetickind:=tsk_jvm_enum_fpcvalueof;
         { similar (instance) function for use in set factories; implements FpcEnumValueObtainable interface }
         if not str_parse_method_dec('function fpcGenericValueOf(__fpc_int: longint): JLEnum;',potype_function,false,enumclass,pd) then
-          internalerror(2011062402);
+          internalerror(2011062404);
         pd.synthetickind:=tsk_jvm_enum_fpcvalueof;
 
         { insert "public static valueOf(string): tenumclass" that returns tenumclass(inherited valueOf(tenumclass,string)) }
@@ -417,7 +417,7 @@ implementation
             old_current_structdef:=current_structdef;
             current_structdef:=pvclass;
             if not str_parse_method_dec('constructor Create(__intf:'+pvintf.objextname^+');overload;',potype_constructor,false,pvclass,methoddef) then
-              internalerror(2011092401);
+              internalerror(2011092402);
             methoddef.synthetickind:=tsk_jvm_procvar_intconstr;
             methoddef.skpara:=def;
             current_structdef:=old_current_structdef;