# HG changeset patch # User nemo # Date 1539098887 14400 # Node ID 0ce8aad17c2438cf8c79289d20dcd78011e47025 # Parent 8c702a4839eca946c7fd66f7d534092a1604a82a IFDEF out missing function with FIXME, revert pas2c change in 0ecf77e203c0 as suggested by unc0rr, another string annotation diff -r 8c702a4839ec -r 0ce8aad17c24 hedgewars/uLocale.pas --- a/hedgewars/uLocale.pas Tue Oct 09 09:58:33 2018 -0400 +++ b/hedgewars/uLocale.pas Tue Oct 09 11:28:07 2018 -0400 @@ -197,7 +197,10 @@ else begin delete(tempstr, p, 2); +//FIXME rtl/system needs an ansi insert +{$IFNDEF PAS2C} insert(curArg, tempstr, p); +{$ENDIF} end; end; FormatA:= tempstr; diff -r 8c702a4839ec -r 0ce8aad17c24 hedgewars/uStats.pas --- a/hedgewars/uStats.pas Tue Oct 09 09:58:33 2018 -0400 +++ b/hedgewars/uStats.pas Tue Oct 09 11:28:07 2018 -0400 @@ -369,7 +369,7 @@ if SendRankingStatsOn then begin currentRank:= 1; - SendStat(siTeamRank, '1'); + SendStat(siTeamRank, _S'1'); SendStat(siPlayerKills, IntToStr(Clan^.Color) + ' ' + IntToStr(stats.Kills) + ' ' + TeamName); end; diff -r 8c702a4839ec -r 0ce8aad17c24 tools/pas2c/Pas2C.hs --- a/tools/pas2c/Pas2C.hs Tue Oct 09 09:58:33 2018 -0400 +++ b/tools/pas2c/Pas2C.hs Tue Oct 09 11:28:07 2018 -0400 @@ -612,7 +612,7 @@ varDeclDecision True True varStr expStr = varStr <+> expStr varDeclDecision False True varStr expStr = if externVar then varStr else varStr <+> expStr varDeclDecision False False varStr expStr = varStr <+> expStr - varDeclDecision True False varStr expStr = varStr <+> expStr + varDeclDecision True False _ _ = empty arrayDimension a = case a of ArrayDecl Nothing t' -> let a' = arrayDimension t' in if a' > 3 then error "Dynamic array with dimension > 4 is not supported." else 1 + a'