U packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40076 into '.':
U .
--- Merging r40081 into '.':
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
U packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40081 into '.':
G .
--- Merging r40083 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40083 into '.':
G .
--- Merging r40084 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40084 into '.':
G .
--- Merging r40085 into '.':
U packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40085 into '.':
G .
--- Merging r40101 into '.':
U packages/pastojs/src/pas2jsfileutils.pp
U packages/pastojs/src/pas2jsfileutilsnodejs.inc
--- Recording mergeinfo for merge of r40101 into '.':
G .
--- Merging r40105 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40105 into '.':
G .
--- Merging r40106 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40106 into '.':
G .
--- Merging r40107 into '.':
U packages/pastojs/src/pas2jspparser.pp
--- Recording mergeinfo for merge of r40107 into '.':
G .
--- Merging r40116 into '.':
U utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40116 into '.':
G .
--- Merging r40126 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40126 into '.':
G .
--- Merging r40127 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40127 into '.':
G .
--- Merging r40133 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40133 into '.':
G .
--- Merging r40135 into '.':
U packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40135 into '.':
G .
--- Merging r40138 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40138 into '.':
G .
--- Merging r40139 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40139 into '.':
G .
--- Merging r40140 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40140 into '.':
G .
--- Merging r40143 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40143 into '.':
G .
--- Merging r40146 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40146 into '.':
G .
--- Merging r40148 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40148 into '.':
G .
--- Merging r40151 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40151 into '.':
G .
--- Merging r40152 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40152 into '.':
G .
--- Merging r40164 into '.':
U utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40164 into '.':
G .
--- Merging r40168 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40168 into '.':
G .
--- Merging r40175 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40175 into '.':
G .
--- Merging r40177 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40177 into '.':
G .
--- Merging r40192 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40192 into '.':
G .
--- Merging r40193 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40193 into '.':
G .
--- Merging r40194 into '.':
U packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40194 into '.':
G .
--- Merging r40204 into '.':
U packages/fcl-passrc/src/pasuseanalyzer.pas
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40204 into '.':
G .
--- Merging r40209 into '.':
G packages/pastojs/src/pas2jslogger.pp
--- Recording mergeinfo for merge of r40209 into '.':
G .
--- Merging r40210 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40210 into '.':
G .
--- Merging r40211 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40211 into '.':
G .
--- Merging r40241 into '.':
U utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40241 into '.':
G .
--- Merging r40243 into '.':
G utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40243 into '.':
G .
--- Merging r40245 into '.':
U utils/pas2js/pas2js.cfg
--- Recording mergeinfo for merge of r40245 into '.':
G .
--- Merging r40258 into '.':
G utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40258 into '.':
G .
--- Merging r40259 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40259 into '.':
G .
--- Merging r40263 into '.':
U packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40263 into '.':
G .
--- Merging r40279 into '.':
U packages/pastojs/tests/tcfiler.pas
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/pas2jspparser.pp
G packages/pastojs/src/fppas2js.pp
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40279 into '.':
G .
--- Merging r40290 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40290 into '.':
G .
--- Merging r40302 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40302 into '.':
G .
--- Merging r40304 into '.':
U packages/fcl-passrc/src/paswrite.pp
--- Recording mergeinfo for merge of r40304 into '.':
G .
--- Merging r40305 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40305 into '.':
G .
--- Merging r40342 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40342 into '.':
G .
--- Merging r40343 into '.':
U packages/pastojs/src/pas2jsfiler.pp
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40343 into '.':
G .
--- Merging r40351 into '.':
U packages/fcl-js/src/jswriter.pp
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jsfileutilsunix.inc
G packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/fppas2js.pp
U packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40351 into '.':
G .
--- Merging r40352 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfileutilsnodejs.inc
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40352 into '.':
G .
--- Merging r40353 into '.':
U utils/pas2js/pas2jslib.lpi
--- Recording mergeinfo for merge of r40353 into '.':
G .
--- Merging r40354 into '.':
U packages/pastojs/fpmake.pp
--- Recording mergeinfo for merge of r40354 into '.':
G .
--- Merging r40355 into '.':
G packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40355 into '.':
G .
--- Merging r40356 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfileutils.pp
U utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40356 into '.':
G .
--- Merging r40372 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
G utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40372 into '.':
G .
--- Merging r40423 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40423 into '.':
G .
--- Merging r40424 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40424 into '.':
G .
--- Merging r40426 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40426 into '.':
G .
--- Merging r40427 into '.':
G packages/pastojs/fpmake.pp
G packages/pastojs/src/pas2jscompiler.pp
A packages/pastojs/src/pas2jspcucompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40427 into '.':
G .
--- Merging r40428 into '.':
U packages/pastojs/tests/tcunitsearch.pas
U packages/pastojs/tests/testpas2js.lpi
--- Recording mergeinfo for merge of r40428 into '.':
G .
--- Merging r40429 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40429 into '.':
G .
--- Merging r40430 into '.':
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jspcucompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40430 into '.':
G .
--- Merging r40439 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jspcucompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40439 into '.':
G .
--- Merging r40440 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40440 into '.':
G .
--- Merging r40441 into '.':
G packages/pastojs/src/pas2jspcucompiler.pp
--- Recording mergeinfo for merge of r40441 into '.':
G .
# revisions: 40076,40081,40083,40084,40085,40101,40105,40106,40107,40116,40126,40127,40133,40135,40138,40139,40140,40143,40146,40148,40151,40152,40164,40168,40175,40177,40192,40193,40194,40204,40209,40210,40211,40241,40243,40245,40258,40259,40263,40279,40290,40302,40304,40305,40342,40343,40351,40352,40353,40354,40355,40356,40372,40423,40424,40426,40427,40428,40429,40430,40439,40440,40441
git-svn-id: branches/fixes_3_2@40718 -
G packages/fcl-passrc/tests/tcresolver.pas
G packages/pastojs/tests/tcprecompile.pas
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jsfiler.pp
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r39851 into '.':
G .
--- Merging r39853 into '.':
U packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r39853 into '.':
G .
--- Merging r39854 into '.':
U packages/fcl-js/src/jswriter.pp
U packages/pastojs/tests/tcsrcmap.pas
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r39854 into '.':
G .
--- Merging r39855 into '.':
U packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r39855 into '.':
G .
--- Merging r39856 into '.':
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39856 into '.':
G .
--- Merging r39857 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39857 into '.':
G .
--- Merging r39898 into '.':
G packages/fcl-js/src/jsbase.pp
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r39898 into '.':
G .
--- Merging r39899 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39899 into '.':
G .
--- Merging r39904 into '.':
U packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r39904 into '.':
G .
--- Merging r39906 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39906 into '.':
G .
--- Merging r39908 into '.':
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r39908 into '.':
G .
--- Merging r39919 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/tcuseanalyzer.pas
U packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r39919 into '.':
G .
--- Merging r39921 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r39921 into '.':
G .
--- Merging r39926 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39926 into '.':
G .
--- Merging r39928 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r39928 into '.':
G .
--- Merging r39929 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39929 into '.':
G .
--- Merging r39932 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r39932 into '.':
G .
--- Merging r39937 into '.':
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r39937 into '.':
G .
--- Merging r39939 into '.':
U packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r39939 into '.':
G .
--- Merging r39940 into '.':
U packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pparser.pp
U packages/pastojs/tests/tcfiler.pas
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/src/pas2jsfiler.pp
--- Recording mergeinfo for merge of r39940 into '.':
G .
--- Merging r39942 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r39942 into '.':
G .
--- Merging r39944 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39944 into '.':
G .
--- Merging r39946 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r39946 into '.':
G .
--- Merging r39966 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r39966 into '.':
G .
--- Merging r39968 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r39968 into '.':
G .
--- Merging r39974 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39974 into '.':
G .
--- Merging r39975 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39975 into '.':
G .
--- Merging r39976 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39976 into '.':
G .
--- Merging r39977 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r39977 into '.':
G .
--- Merging r39979 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r39979 into '.':
G .
--- Merging r39985 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r39985 into '.':
G .
--- Merging r40013 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40013 into '.':
G .
--- Merging r40018 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40018 into '.':
G .
--- Merging r40029 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40029 into '.':
G .
--- Merging r40030 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40030 into '.':
G .
--- Merging r40032 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40032 into '.':
G .
--- Merging r40034 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40034 into '.':
G .
--- Merging r40036 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r40036 into '.':
G .
--- Merging r40037 into '.':
A utils/pas2js/nodepas2js.pp
A utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40037 into '.':
G .
--- Merging r40039 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40039 into '.':
G .
--- Merging r40040 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40040 into '.':
G .
--- Merging r40041 into '.':
G packages/pastojs/src/pas2jslogger.pp
U packages/pastojs/src/pas2jsfileutils.pp
U packages/pastojs/src/pas2jsfilecache.pp
U packages/pastojs/src/pas2js_defines.inc
U packages/pastojs/src/pas2jsfileutilswin.inc
G packages/pastojs/src/pas2jscompiler.pp
A packages/pastojs/src/pas2jsfileutilsnodejs.inc
U packages/pastojs/src/pas2jsfileutilsunix.inc
--- Recording mergeinfo for merge of r40041 into '.':
G .
--- Merging r40042 into '.':
U utils/pas2js/pas2js.pp
U utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40042 into '.':
G .
--- Merging r40043 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40043 into '.':
G .
--- Merging r40044 into '.':
U packages/pastojs/src/pas2jspparser.pp
G packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40044 into '.':
G .
--- Merging r40045 into '.':
G utils/pas2js/nodepas2js.pp
U packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r40045 into '.':
G .
--- Merging r40046 into '.':
G packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40046 into '.':
G .
--- Merging r40047 into '.':
G packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40047 into '.':
G .
--- Merging r40048 into '.':
G packages/fcl-js/src/jssrcmap.pas
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40048 into '.':
G .
--- Merging r40049 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jsfiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
U packages/pastojs/src/fppjssrcmap.pp
G packages/pastojs/src/pas2js_defines.inc
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40049 into '.':
G .
--- Merging r40051 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40051 into '.':
G .
--- Merging r40053 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/fppjssrcmap.pp
--- Recording mergeinfo for merge of r40053 into '.':
G .
--- Merging r40055 into '.':
G packages/fcl-json/src/fpjson.pp
U packages/fcl-json/tests/testjsondata.pp
--- Recording mergeinfo for merge of r40055 into '.':
G .
--- Merging r40058 into '.':
U packages/fcl-json/tests/testjsonparser.pp
U packages/fcl-json/tests/testjson.pp
U packages/fcl-json/tests/testjson.lpi
G packages/fcl-json/tests/testjsondata.pp
G packages/fcl-json/src/fpjson.pp
G packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r40058 into '.':
G .
--- Merging r40061 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40061 into '.':
G .
--- Merging r40062 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jspparser.pp
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/tests/tcfiler.pas
G utils/pas2js/nodepas2js.pp
U utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40062 into '.':
G .
--- Merging r40064 into '.':
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jsfileutilsnodejs.inc
G packages/pastojs/src/pas2jsfileutils.pp
G packages/fcl-json/src/fpjson.pp
G utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40064 into '.':
G .
--- Merging r40067 into '.':
G packages/pastojs/src/pas2jsfileutilsnodejs.inc
G packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40067 into '.':
G .
--- Merging r40072 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/pas2jscompiler.pp
G packages/fcl-json/src/fpjson.pp
G packages/fcl-js/src/jswriter.pp
G packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40072 into '.':
G .
--- Merging r40075 into '.':
G packages/fcl-json/src/fpjson.pp
G packages/pastojs/src/pas2jscompiler.pp
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40075 into '.':
G .
--- Merging r40077 into '.':
G packages/fcl-js/src/jssrcmap.pas
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40077 into '.':
G .
--- Merging r40080 into '.':
G packages/fcl-js/src/jswriter.pp
U packages/fcl-js/src/jsscanner.pp
--- Recording mergeinfo for merge of r40080 into '.':
G .
--- Merging r40082 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r40082 into '.':
G .
--- Merging r40098 into '.':
G utils/pas2js/nodepas2js.pp
U utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40098 into '.':
G .
--- Merging r40099 into '.':
G packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40099 into '.':
G .
--- Merging r40100 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40100 into '.':
G .
--- Merging r40108 into '.':
G utils/pas2js/nodepas2js.lpi
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40108 into '.':
G .
--- Merging r40125 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40125 into '.':
G .
--- Merging r40129 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40129 into '.':
G .
--- Merging r40136 into '.':
G packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r40136 into '.':
G .
--- Merging r40137 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40137 into '.':
G .
--- Merging r40144 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
G utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40144 into '.':
G .
--- Merging r40150 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40150 into '.':
G .
--- Merging r40165 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40165 into '.':
G .
--- Merging r40166 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40166 into '.':
G .
--- Merging r40171 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40171 into '.':
G .
--- Merging r40173 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/pas2jscompiler.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40173 into '.':
G .
# revisions: 39851,39853,39854,39855,39856,39857,39898,39899,39904,39906,39908,39919,39921,39926,39928,39929,39932,39937,39939,39940,39942,39944,39946,39966,39968,39974,39975,39976,39977,39979,39985,40013,40018,40029,40030,40032,40034,40036,40037,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40051,40053,40055,40058,40061,40062,40064,40067,40072,40075,40077,40080,40082,40098,40099,40100,40108,40125,40129,40136,40137,40144,40150,40165,40166,40171,40173
git-svn-id: branches/fixes_3_2@40709 -
pasresolver: checking all varargs arguments
pasresolver: checking arguments are readable
fppas2js: fixed using externals from other units
git-svn-id: trunk@35631 -
- external vars
- untyped parameters
- varargs
- SetLength(s,len) is now converted to s.length=len
- destructor now clears references
- dynamic arrays now are never null.
- anArr:=nil becomes anArr = []
- anArr=nil becomes anArr.length==0
- passing nil to an array parameter passes []
- length(anArr) becomes anArr.length
- High(anArr) becomes anArr.length-1
- sets now uses references when assigning and passing to a parameter.
Far less clone operations.
git-svn-id: trunk@35505 -
- local const: declare as local var in singleton parent function
- give procedure overloads in module unique names by appending $1, $2, ...
- give nested procedure overloads unique names by appending $1, $2, ...
- give reintroduced/overloaded class members unique names by appending $1, $2, ...
- record operators = and <>
- static arrays
- range: enumtype
- init as arr = rtl.arrayNewMultiDim([dim1,dim2,...],value)
- init with expression from const array
- length(1-dim array)
- low(1-dim array), high(1-dim array)
- property TargetProcessor
- ECMAScript6:
- use 0b for binary literals, and 0o for octal literals
git-svn-id: trunk@35491 -
+ changed varname/funcname properties to string, saving many conversion
+ array of record
+ pass by reference
- pass local var to a var/out parameter
- pass variable to a var/out parameter
- pass reference to a var/out parameter
- pass array element to a var/out parameter
+ proc types
- implemented as immutable wrapper function
- assign := nil, proctype (not clone), @function, @method
- call explicit and implicit
- compare equal and notequal with nil, proctype, address, function
- assigned(proctype)
- pass as argument
- methods
- mode delphi: proctype:=proc
- mode delphi: functype=funcresulttype
+ class-of
- assign := nil, var
- call class method
- call constructor
- operators =, <>
- class var, property, method
- Self in class method
- typecast
git-svn-id: trunk@35472 -
