Commit Graph

8 Commits

Author SHA1 Message Date
marco
586398ad41 # revisions: 40446,40447,40450,40451,40452,40455,40456,40457,40458,40459,40460,40461,40469,40470,40471,40473,40474,40475,40476,40477,40478,40479,40483,40484,40486,40487,40488,40489,40491,40493,40494,40495,40505,40506,40507,40508,40509,40514,40516,40517,40518,40522,40523,40530,40531,40533,40534,40549,40550,40551,40553,40554,40555,40558,40559,40562,40580,40582,40584,40591,40593,40594,40596,40597,40620,40638,40639,40650,40659,40671,40672,40674,40675,40685,40691,40708,40712,40714,40715,40722,40768,40795,40796,40797,40799
git-svn-id: branches/fixes_3_2@41993 -
2019-05-05 14:36:34 +00:00
marco
4d66a5b4ad --- Merging r39851 into '.':
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 -
2018-12-30 15:42:04 +00:00
Mattias Gaertner
df71ab3ecf pastojs: writestr and -Sm
git-svn-id: trunk@39125 -
2018-05-27 22:01:09 +00:00
Mattias Gaertner
fc805c4bd2 pas2js: marker for checking writeln statements
git-svn-id: trunk@38139 -
2018-02-06 13:50:18 +00:00
Mattias Gaertner
17c010b9a3 pas2js: catch jswriter exceptions
git-svn-id: trunk@38114 -
2018-02-04 18:49:06 +00:00
michael
8342c502c5 * Initial check-in of pas2js changes
git-svn-id: trunk@37749 -
2017-12-16 15:55:10 +00:00
michael
cccff83bab * Fix compilation
git-svn-id: trunk@36817 -
2017-08-02 11:11:54 +00:00
michael
181892cc5f * First implementation of pas2js converter program
git-svn-id: trunk@27476 -
2014-04-05 09:19:55 +00:00