Commit Graph

69 Commits

Author SHA1 Message Date
marco
c47579239a # revisions: 46324,46400,46451,46452,46508,46509,46512,46513,46515,46516,46517,46518,46662,46663,46686,46687,46704,46705,46723,46724
git-svn-id: branches/fixes_3_2@46829 -
2020-09-10 13:51:54 +00:00
marco
693fc5e1f4 # revisions: 45709,45714,45715,45716,45742,45830,45861,45862,45863,45962,45963,45964,45965,45966,46272,46273,46287,
git-svn-id: branches/fixes_3_2@46826 -
2020-09-10 13:07:54 +00:00
marco
3336c25699 # revisions: 44169,44173,44201,44202,44203,44207,44208,44219,44220,44238,44292,44387,44388,44431,44432,44437,44684,45054,45069,45121,45123,45293,45294,45295,45296,45297,45309,45315,45321,45335,45349,45369,45374,45392,45414,45416,45417,45418,45419,45423,45427,45431,45432,45433,45434,45435,45442,45443,45445,45461,45462,45464,45471,45472,45473,45505,45506,45507,45508,45512,45513,45514,45515,45516,45517,45518,45523,45526,45530,45531,45535,45537,45538,45545,45562
git-svn-id: branches/fixes_3_2@46823 -
2020-09-10 12:51:33 +00:00
marco
239c7268ab # revisions: 43689,43690,43691,43692,43809,43810,43811,43813,43853,43873,43890,43951,43952,43953,43960,44077,44078,44110,44121,44122,44134,44135,44137,44140,44146
git-svn-id: branches/fixes_3_2@46822 -
2020-09-10 12:48:34 +00:00
marco
cf2b4ee4f7 # revisions: 43198,43199,43201,43202,43204,43206,43207,43209,43210,43212,43213,43214,43215,43216,43219,43220,43221,43222,43223,43224,43225,43228,43229,43285,43286,43287,43288,43295,43296,43297,43303,43304,43310,43316,43317,43318,43320,43321,43322,43323,43325,43326,43329,43330,43331,43332,43333
git-svn-id: branches/fixes_3_2@43380 -
2019-11-03 14:20:49 +00:00
marco
95202dc8c4 # revisions: 42759,42769,42770,42771,42811,42818,42819,42824,42826,42827,42828,42830,42866,42869,42870,42874,42877,42878,42880,42881,42889,42890,42893,42894,42895,42896,42918,42948,42950,42951,42952,42953,42954,43020,43021,43031,43032,43049,43050,43051,43052,43053,43056,43057,43077,43078,43079,43084,43090,43099,43101,43145,43146,43147,43148,43149,43150,43151,43159,43160,43161,43164,43166,43168
git-svn-id: branches/fixes_3_2@43379 -
2019-11-03 14:13:54 +00:00
marco
46f3f08f6a # revisions: 41903,42177,42217,42218,42227,42251,42252,42258,42287,42288,42289,42290,42291,42292,42293,42310,42347,42348,42355,42445,42450,42451,42453,42454,42462,42465,42466,42468,42472,42473,42474,42475
git-svn-id: branches/fixes_3_2@43377 -
2019-11-03 14:00:03 +00:00
marco
7e85b53c0a # revisions: 41707,41713,41714,41715,41719,41720,41732,41786,41787,41788,41792,41805,41806,41808,41809,41823,41824,41825,41840,41850,41851,41856,41862,41863,41864,41872,41876,41897,41931
git-svn-id: branches/fixes_3_2@41998 -
2019-05-05 15:31:55 +00:00
marco
0fa5c1b1e3 # revisions: 41456,41461,41465,41466,41467,41468,41473,41478,41479,41480,41482,41483,41494,41495,41496,41500,41501,41502,41503,41504,41505,41527,41528,41529,41530,41542,41557,41558,41561,41572,41573,41581,41582,41583,41585,41586,41587,41590,41593,41594,41598,41600,41603,41611,41617,41618,41619,41621,41622,41623,41624,41630,41631,41632,41633,41634,41657,41658,41661,41663,41664,41665,41666,41676,41680,41681,41684,41690,41691,41694
git-svn-id: branches/fixes_3_2@41997 -
2019-05-05 15:27:59 +00:00
marco
3dc0752bf5 # revisions: 41022,41023,41024,41025,41026,41046,41058,41062,41063,41064,41066,41067,41075,41078,41082,41083,41084,41086,41087,41123,41124,41125,41132,41144,41145,41147,41148,41149,41151,41152,41154,41155,41156,41157,41162,41188,41189,41190,41192,41218,41221,41223,41224,41225,41234,41235,41238,41239,41244,41246,41251,41252,41255,41256,41257,41259,41270,41272,41273,41275,41276,41278,41279,41292,41293,41294,41295,41297,41298,41300,41301,41302,41303,41304,41312,41313,41319,41326,41327,41328,41329,41333,41338,41339,41340,41344,41346,41348,41350,41358,41359,41360,41361,41362,41364,41365,41378,41386,41387,41388,41389,41390,41392,41426,41427,41430,41431,41433,41434,41435,41436,41437,41438,41439,41440
git-svn-id: branches/fixes_3_2@41996 -
2019-05-05 15:25:38 +00:00
marco
5611e2f10b # revisions: 40806,40807,40808,40809,40819,40846,40847,40859,40869,40870,40871,40872,40881,40882,40886
git-svn-id: branches/fixes_3_2@41994 -
2019-05-05 14:40:51 +00:00
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
e16529a374 --- Merging r40076 into '.':
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 -
2018-12-31 16:37:10 +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
7e64102b74 fcl-passrc: fixed scanner row, col in macro
git-svn-id: trunk@39344 -
2018-06-29 15:48:21 +00:00
Mattias Gaertner
7a6fed75a0 fcl-passrc: $warn directive
git-svn-id: trunk@39315 -
2018-06-27 14:27:43 +00:00
Mattias Gaertner
b2bd41d08e pastojs: hint how to use -vl
git-svn-id: trunk@39300 -
2018-06-25 09:27:49 +00:00
Mattias Gaertner
821182d518 pas2js: docs
git-svn-id: trunk@39284 -
2018-06-23 08:36:45 +00:00
Mattias Gaertner
118ec57000 pastojs: typecast function to TJSFunction
git-svn-id: trunk@39208 -
2018-06-10 13:45:40 +00:00
Mattias Gaertner
2a598c851f pastojs: allow {$H+}, error on {$H-}
git-svn-id: trunk@39128 -
2018-05-28 06:46:52 +00:00
Mattias Gaertner
df71ab3ecf pastojs: writestr and -Sm
git-svn-id: trunk@39125 -
2018-05-27 22:01:09 +00:00
Mattias Gaertner
763fd783e0 pastojs: typecast array to/from tjsobject
git-svn-id: trunk@39034 -
2018-05-20 10:40:07 +00:00
Mattias Gaertner
3d186b2706 pastojs: for value in externalarray do
git-svn-id: trunk@39026 -
2018-05-19 17:59:50 +00:00
Mattias Gaertner
8a5c519f2d pastojs: option -FE
git-svn-id: trunk@38983 -
2018-05-12 18:26:39 +00:00
Mattias Gaertner
69d6e8ac90 pastojs: added option -vv, -va includes -vd
git-svn-id: trunk@38965 -
2018-05-10 09:27:40 +00:00
Mattias Gaertner
e9843bccf0 pastojs: added option -SI<interfacestyel>
git-svn-id: trunk@38964 -
2018-05-10 08:00:33 +00:00
Mattias Gaertner
cc7983d781 pastojs: external class field with brackets
git-svn-id: trunk@38958 -
2018-05-09 12:47:17 +00:00
Mattias Gaertner
e283024ad7 pastojs: added option -vz, -ic, -io, -it, fixed -va writing used files, fixed -o. -Jc, -vt now writes used unit scopes
git-svn-id: trunk@38957 -
2018-05-09 08:41:44 +00:00
Mattias Gaertner
d323bd087e pastojs: added option -FN<x>, marked -NS as obsolete
git-svn-id: trunk@38940 -
2018-05-07 07:17:32 +00:00
Mattias Gaertner
7ea975a869 pastojs: default(record)
git-svn-id: trunk@38882 -
2018-04-30 23:48:28 +00:00
Mattias Gaertner
8100f9b222 pastojs: nested classes
git-svn-id: trunk@38878 -
2018-04-30 18:03:48 +00:00
Mattias Gaertner
a918071130 pastojs: docs
git-svn-id: trunk@38876 -
2018-04-30 08:32:44 +00:00
Mattias Gaertner
994167481d pas2js: docs: record const
git-svn-id: trunk@38870 -
2018-04-29 19:26:57 +00:00
Mattias Gaertner
b6f50c9847 pas2js: docs: type alias type
git-svn-id: trunk@38853 -
2018-04-27 08:45:36 +00:00
Mattias Gaertner
0fd731efc5 pastojs: docs: typecast int(int)
git-svn-id: trunk@38843 -
2018-04-25 13:37:39 +00:00
Mattias Gaertner
2750a0010c fcl-passrc: resolver: GetElementSourcePos for intrinsic
git-svn-id: trunk@38841 -
2018-04-25 00:24:00 +00:00
Mattias Gaertner
63032c796f pas2js: docs
git-svn-id: trunk@38826 -
2018-04-23 17:25:14 +00:00
Mattias Gaertner
73310ac57f pastojs: jsvalue:=currency
git-svn-id: trunk@38808 -
2018-04-22 11:35:58 +00:00
Mattias Gaertner
0601b437a4 pas2js: added option -JoUseStrict
git-svn-id: trunk@38793 -
2018-04-19 12:42:00 +00:00
Mattias Gaertner
2945f4a3c9 pas2js: changed TGuid to record
git-svn-id: trunk@38792 -
2018-04-19 12:16:03 +00:00
Mattias Gaertner
77cf535e21 pas2js: version 0.9.15
git-svn-id: trunk@38715 -
2018-04-08 15:37:03 +00:00
Mattias Gaertner
bb13e36c80 pas2js: docs: fixed typo
git-svn-id: trunk@38712 -
2018-04-08 13:05:14 +00:00
Mattias Gaertner
5140e1b022 pas2js: docs: interfaces JS
git-svn-id: trunk@38711 -
2018-04-08 12:59:12 +00:00
Mattias Gaertner
c2fe9080d6 pas2js: docs: guid
git-svn-id: trunk@38710 -
2018-04-08 12:20:58 +00:00
Mattias Gaertner
eb0992a79e pas2js: docs about class interfaces
git-svn-id: trunk@38708 -
2018-04-08 09:05:48 +00:00
Mattias Gaertner
fe8f7a9876 pas2js: docs: property getter array element not supported
git-svn-id: trunk@38508 -
2018-03-12 16:55:54 +00:00
Mattias Gaertner
3508070d10 pas2js: set version 0.9.6
git-svn-id: trunk@38438 -
2018-03-06 17:52:07 +00:00
Mattias Gaertner
dd246f5698 pas2js: docs
git-svn-id: trunk@38436 -
2018-03-06 14:09:54 +00:00
Mattias Gaertner
b8710d8fec fcl-passrc: fixed stConstDef for class local const
git-svn-id: trunk@38097 -
2018-02-01 17:48:44 +00:00
Mattias Gaertner
32fee98477 pas2js: docs: anonymous functions
git-svn-id: trunk@38095 -
2018-02-01 12:55:53 +00:00