From d2a2aff2d8cc81aaacaf66966b5debf8440b978f Mon Sep 17 00:00:00 2001 From: jayhulbl Date: Tue, 20 Dec 2022 16:52:26 -0800 Subject: [PATCH 1/4] corrected the connector instantiate keyword --- lib/evaluateMath.js | 16 +++++++++------- lib/jsonquery.js | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/evaluateMath.js b/lib/evaluateMath.js index 55c8cd88..c67785aa 100644 --- a/lib/evaluateMath.js +++ b/lib/evaluateMath.js @@ -530,13 +530,15 @@ function findNewExpression (valType, valExp, allPar) { // replace the modelica constant with their value newValue = modelicaConstants(tmpStr) } else { - for (var j = 0; j < allPar.length; j++) { - var tmpPar = allPar[j] - if (tmpStr === tmpPar.name) { - // check if the used parameter itself is specified by expression - var type = tmpPar.type ? tmpPar.type : tmpPar.className - noSubExpression = checkType(type, tmpPar.value) - newValue = tmpPar.value + if (allPar !== null) { + for (var j = 0; j < allPar.length; j++) { + var tmpPar = allPar[j] + if (tmpStr === tmpPar.name) { + // check if the used parameter itself is specified by expression + var type = tmpPar.type ? tmpPar.type : tmpPar.className + noSubExpression = checkType(type, tmpPar.value) + newValue = tmpPar.value + } } } } diff --git a/lib/jsonquery.js b/lib/jsonquery.js index eab9d477..a09eb0f4 100644 --- a/lib/jsonquery.js +++ b/lib/jsonquery.js @@ -1039,7 +1039,7 @@ function getComponentsOfClass (model, parseMode, className, prefix) { function setCDLdefaultValue (parseMode, condition, annotation, type, declarations, currentClass) { // If it is not in CDL mode, or it is not removable input connector, or there is vendor annotation to specify the default value, // then do not need to specify the default value in this process - if (parseMode !== 'cdl' || !condition.enable || (annotation.__cdl && annotation.__cdl.default) || type.includes('Output')) { + if (parseMode !== 'cdl' || !condition.instantiate || (annotation.__cdl && annotation.__cdl.default) || type.includes('Output')) { return Object.assign({'__cdl': null}) } // Removable Real input From fd51b3e6eebe76ca46749c94468e7d654e4b3f62 Mon Sep 17 00:00:00 2001 From: Anand Prakash Date: Wed, 21 Dec 2022 08:23:44 -0800 Subject: [PATCH 2/4] regenerating reference outputs --- .../cdl/docx/FromModelica.Block1.docx | Bin 23323 -> 23323 bytes .../docx/FromModelica.BlockInputOutput.docx | Bin 33894 -> 33894 bytes .../docx/FromModelica.BlockWithBlock1.docx | Bin 40544 -> 40544 bytes .../docx/FromModelica.ConditionalBlock.docx | Bin 39632 -> 39632 bytes .../docx/FromModelica.CustomPWithLimiter.docx | Bin 56877 -> 56877 bytes .../docx/FromModelica.DynamicTextColor.docx | Bin 23381 -> 23381 bytes .../cdl/docx/FromModelica.EmptyEquation.docx | Bin 23337 -> 23337 bytes .../cdl/docx/FromModelica.Enable.docx | Bin 90825 -> 90825 bytes ...omModelica.MisplacedInfoWithComponent.docx | Bin 39962 -> 39962 bytes ...romModelica.MisplacedInfoWithEquation.docx | Bin 42129 -> 42129 bytes ...omModelica.MisplacedInfoWithParameter.docx | Bin 24093 -> 24093 bytes .../cdl/docx/FromModelica.MyController.docx | Bin 93187 -> 93187 bytes .../cdl/docx/FromModelica.NoClassComment.docx | Bin 24001 -> 24001 bytes .../docx/FromModelica.NoWithin-package.docx | Bin 23886 -> 23886 bytes .../cdl/docx/FromModelica.Parameter1.docx | Bin 24007 -> 24007 bytes ...delica.Parameter1WithVendorAnnotation.docx | Bin 24067 -> 24067 bytes .../cdl/docx/FromModelica.Parameter2.docx | Bin 26734 -> 26734 bytes .../cdl/docx/FromModelica.Parameter3.docx | Bin 24309 -> 24309 bytes .../FromModelica.ParameterWithAttributes.docx | Bin 24123 -> 24123 bytes ...FromModelica.ParameterWithDefaultName.docx | Bin 24102 -> 24102 bytes .../docx/FromModelica.ParameterWithInfo.docx | Bin 24081 -> 24081 bytes ...a.ParameterWithVendorAnnotationInInfo.docx | Bin 24135 -> 24135 bytes .../cdl/docx/FromModelica.PointList.docx | Bin 153191 -> 153191 bytes .../docx/FromModelica.RemovableInputs.docx | Bin 53972 -> 53972 bytes .../cdl/docx/FromModelica.SubController.docx | Bin 37305 -> 37305 bytes .../docx/FromModelica.TestEvaluation_1.docx | Bin 30441 -> 30441 bytes .../docx/FromModelica.TestEvaluation_2.docx | Bin 47334 -> 47334 bytes .../docx/FromModelica.TestEvaluation_3.docx | Bin 34974 -> 34974 bytes .../docx/FromModelica.TestEvaluation_4.docx | Bin 170816 -> 170816 bytes .../FromModelica.VariableModification.docx | Bin 39516 -> 39516 bytes .../docx/FromModelica.WithCDLElementary.docx | Bin 41380 -> 41380 bytes .../cdl/docx/FromModelica.package.docx | Bin 23886 -> 23886 bytes .../json/FromModelica.ConditionalBlock.json | 3 +++ .../cdl/json/FromModelica.Enable.json | 6 ++++++ .../json/FromModelica.RemovableInputs.json | 12 ++++++++++++ .../modelica/docx/FromModelica.docx | Bin 158028 -> 158028 bytes 36 files changed, 21 insertions(+) diff --git a/test/FromModelica/cdl/docx/FromModelica.Block1.docx b/test/FromModelica/cdl/docx/FromModelica.Block1.docx index 10e957affd84602dcc8e19a932eb4b74715589c8..ee61af2f1202490637db2978f80bbf5312811d39 100644 GIT binary patch delta 147 zcmbQejdAuiM&1B#W)?065SZ&YbtCV8MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z%=8AUoD;4FmN*)o4N++vX$O`li8KV$D0H!17+JNa9bFIPjwYd;^{&|4_ D^4m9) delta 147 zcmaE`hv~r{Cf)#VW)?065SUOlWh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z-0K6Yd^k%DEWtH98=|sejvZKH=Nv;Y{dSHSm{yx>0H!17+JNa9bFIPjwYd;^{&|4_ Drg}O< diff --git a/test/FromModelica/cdl/docx/FromModelica.ConditionalBlock.docx b/test/FromModelica/cdl/docx/FromModelica.ConditionalBlock.docx index a8b7d9edbf96647d6ab05b75a9934e3442b63766..8e29422bc061edc5827dc031fe62e9699ca1e760 100644 GIT binary patch delta 147 zcmcbxmFdD(Cf)#VW)?065ZL25btCV8MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z_;rI-22NK4OH@tIhNyfo!wxK=InxkK$IdhZ)6-@efa#MnZNN0gENd|BHVYzOKPwOb D95^^X delta 147 zcmcbxmFdD(Cf)#VW)?065ZF>SWh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z_;rI-22NK4OH@tIhNyfo!wxK=InxkK$IdhZ)6-@efa#MnZNN0gENd|BHVYzOKPwOb D)CfBN diff --git a/test/FromModelica/cdl/docx/FromModelica.CustomPWithLimiter.docx b/test/FromModelica/cdl/docx/FromModelica.CustomPWithLimiter.docx index 91e021d978026bb0255d5aa4145092cfe9f47e59..d1cc15c7695c3fa55a509760fd0d66a34109084a 100644 GIT binary patch delta 147 zcmZ3xhk5NDX5IjAW)?065KwfQx{>!kBQubm%+I6Sj delta 147 zcmZ3xhk5NDX5IjAW)?065RfgOvXS>cBQubm%+I6M&1B#W)?065Xg0$x{>!kBQubm%+I6M&1B#W)?065J)VWvXS>cBQubm%+I6VBX$O{QiZle%+ak@t^!rEyFs&421Ev$BtikmBD2V)xs6YUR CO*RGq delta 147 zcmZ3vjdA5RM&1B#W)?065LjF`Wh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 zEcXVhTotYcmbe_A4N>VBX$O{QiZle%+ak@t^!rEyFs&421Ev$BtikmBD2V)xs6YTZ C>^Qan diff --git a/test/FromModelica/cdl/docx/FromModelica.Enable.docx b/test/FromModelica/cdl/docx/FromModelica.Enable.docx index d68b10b81de2651f72224720fbfecc5a312be06b..6c91e729d20adb6920f7dbdc341cc6b3524a135d 100644 GIT binary patch delta 160 zcmX?kl=b9MR^9+_W)?065cumjbtCV8MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05O_) zw(&5!2ZNZ?z2X_wK#c9h@r>DE<DE< D@mx5B delta 147 zcmbQWgK5?dCf)#VW)?065LjI{Wh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z%;*8DoIOJgEOBH;HbkY-EIY77@hn3yy?mA#n0_$J089(dwgJ;Yv#r7OgxL`Jld}T> DsXIGF diff --git a/test/FromModelica/cdl/docx/FromModelica.MisplacedInfoWithEquation.docx b/test/FromModelica/cdl/docx/FromModelica.MisplacedInfoWithEquation.docx index fa3dc13cd07abbc207c6a77dbd9dfa5b227ec141..75645493ffed7b463e1bd852e555aeb867d3596a 100644 GIT binary patch delta 147 zcmbPul4;^eCf)#VW)?065V-0%btCV8MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z@J|J+6k4bTmatx!4NE(} delta 147 zcmbQchjH#6M&1B#W)?065LjL|Wh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z%=QDToEN1AmN*`j4N++tV+WQfi!lV#t76Q+^y3%_ diff --git a/test/FromModelica/cdl/docx/FromModelica.MyController.docx b/test/FromModelica/cdl/docx/FromModelica.MyController.docx index 2c25044d6b88a7f0256a2db072935e3231267e50..84b39483dde5fc1a4ed35a368b3e1ad7313d7b91 100644 GIT binary patch delta 160 zcmZp^!P^D`-e=*`AV1rUK{%nD$ElguU@AVw3< zHXg>t7!Y%MO9rDFh_QWb24gl@`E=^D`-e=*`AV1rUK{%nD$ElguU@AVw3< zHXg>t7!Y%MO9rDFh_QWb24gl@`E=)_r diff --git a/test/FromModelica/cdl/docx/FromModelica.NoWithin-package.docx b/test/FromModelica/cdl/docx/FromModelica.NoWithin-package.docx index af807e5621a83b0aea53412e4e650c1b47284ebc..51b77270c9d9f494da6c9c58b214f6f3bc4e911b 100644 GIT binary patch delta 147 zcmX@Ni}BnpM&1B#W)?065ZLZGbtCV8MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 zobd&#JRhkBmiQ5w4N;jEZ3mWE9&HGwZ%3PfX^|KMFzp^=1E$+ztikk=7>NAem_Psu C7&o>6 delta 147 zcmX@Ni}BnpM&1B#W)?065LjO}Wh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 zobd&#JRhkBmiQ5w4N;jEZ3mWE9&HGwZ%3PfX^|KMFzp^=1E$+ztikk=7>NAem_Pu* C=sI=) diff --git a/test/FromModelica/cdl/docx/FromModelica.Parameter1.docx b/test/FromModelica/cdl/docx/FromModelica.Parameter1.docx index 656cc6f9ab4706c9b6d0460b63537bc8aae9fcdb..ba0248efdb37befa20f74c4ae259d5cf640c3e25 100644 GIT binary patch delta 147 zcmX@UoALN=M&1B#W)?065NLOtx{>!kBQubm%+I6Zc*J)+dW5`|IO5S90%?Z6TWF@|6|B*qL(_r@52=>st~VETWIHJG-Ig~*r11_A)d C@iOE9 delta 147 zcmX@UoALN=M&1B#W)?065U4JjvXS>cBQubm%+I6Zc*J)+dW5`|IO5S90%?Z6TWF@|6|B*qL(_r@52=>st~VETWIHJG-Ig~*r11_A(Z C&^2TL diff --git a/test/FromModelica/cdl/docx/FromModelica.Parameter1WithVendorAnnotation.docx b/test/FromModelica/cdl/docx/FromModelica.Parameter1WithVendorAnnotation.docx index 34934a6799ce0b5444f055367fe60f72442f733b..6f22c414fe698398769a5d92290dfb46673fe1aa 100644 GIT binary patch delta 147 zcmZqP!`QrskvG7bnT3l11kO87-N^f&kr_x&=4Vm_(VLB#3LpZ@m=(YRCz(w+K#Wa1 zjecO2Em3M!kBQubm%+I6 delta 147 zcmeymm+|XfM&1B#W)?06Fesn0k@r6%Geh~5$^1-;AbPVgQvpO^8M6Xd;3TsN2Z*tW zr`R8?vMgE+EHOVi8={go)($M;7i$Qnn_|tt^zK*#F#Rsp22AV5S%c~9IEeg`xIh4^ CBrYoe diff --git a/test/FromModelica/cdl/docx/FromModelica.ParameterWithAttributes.docx b/test/FromModelica/cdl/docx/FromModelica.ParameterWithAttributes.docx index d3c18860dfe62baa64d095168e410f53a91096d3..efef906defe7b235cc32673ca0a99d132a50676c 100644 GIT binary patch delta 147 zcmdnJhjI5FM&1B#W)?065MXnfx{>!kBQubm%+I6(s?i7^DzCt}RNG-Ip*m^O*E0n^2?)?j*LEJXfQY#;#X C1S`$} delta 147 zcmdnJhjI5FM&1B#W)?065MU{vvXS>cBQubm%+I6(s?i7^DzCt}RNG-Ip*m^O*E0n^2?)?j*LEJXfQY#;!- CV=nFh diff --git a/test/FromModelica/cdl/docx/FromModelica.ParameterWithDefaultName.docx b/test/FromModelica/cdl/docx/FromModelica.ParameterWithDefaultName.docx index ce6ce8b7d5ab72f8b2a84753b60a24a758c62394..50b74f0418e09cf26be06d76fbd56dc5f4346a8d 100644 GIT binary patch delta 147 zcmZ3shjG~+M&1B#W)?065a4y1x{>!kBQubm%+I6(ug#~6a?%`s+R`b~@hn3j*V0n>4@)?j*0EJXflY#;#Y C%q%Pb delta 147 zcmZ3shjG~+M&1B#W)?065a2GKvXS>cBQubm%+I6(ug#~6a?%`s+R`b~@hn3j*V0n>4@)?j*0EJXflY#;!< CD=$m{ diff --git a/test/FromModelica/cdl/docx/FromModelica.ParameterWithInfo.docx b/test/FromModelica/cdl/docx/FromModelica.ParameterWithInfo.docx index e96b73fb1a7802fa26528f0b127b812304ec3eb4..9604e09d8245f399fd04747c3d2daf9d489ae513 100644 GIT binary patch delta 147 zcmbQZhjHQ_M&1B#W)?065a4o}x{>!kBQubm%+I6cBQubm%+I6!kBQubm%+I6cBQubm%+I6{#f*n{w_o5+~PP}Lare|F=0MlnL+JI@EOV(i8>k>r1`BESN DA3r%= delta 147 zcmcbzl=;e1X5IjAW)?065SU#yWh3u@MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 z1RVye3_Y&~mZ&?Q4N>{#f*n{w_o5+~PP}Lare|F=0MlnL+JI@EOV(i8>k>r1`BESN D%1=A( diff --git a/test/FromModelica/cdl/docx/FromModelica.SubController.docx b/test/FromModelica/cdl/docx/FromModelica.SubController.docx index 43f1b38839c1d729e5d91f1a525a9a04c8399eff..c0e2a7fdebb86ce8435d2be8af4f20752bdb3aa1 100644 GIT binary patch delta 147 zcmdnFm}%!?Cf)#VW)?065J+*Hx{>!kBQubm%+I6cBQubm%+I6 Ccsz#y diff --git a/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_2.docx b/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_2.docx index f89948fca4ac7114613a2e17049749b563508055..81d10e690bf0c5523afcf69d92facfd7c0028b37 100644 GIT binary patch delta 147 zcmaF%k?Gk-Cf)#VW)?065SZ#XbtCV8MrI&AnV(4!L~k}`Du4(qV^#nQoMblP05LZ4 zq^tz1Oy8;omYA?L8=~^xHaoC{{dPkzUA)~4Ot0B)0H*J6w*k{~JFLNU%npeB)E$8U DGH5uj delta 147 zcmaF%k?Gk-Cf)#VW)?065a=$OvXS>cBQubm%+I6`Tn;lrfe!C%W)AF D;kY|b diff --git a/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_3.docx b/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_3.docx index 35deb5cc63a84f97eb154872dab53454467ad28f..cdd864f35a9de4c83e469ec4ecd8bf7554f180f0 100644 GIT binary patch delta 147 zcmbO?k!jvUCf)#VW)?065Xf|#x{>!kBQubm%+I6cBQubm%+I6!kBQubm%+I68IyD>)q delta 163 zcmX@GjqAWRF5UodW)?065D+h)vXS>cBQubm%+I681m^5bq diff --git a/test/FromModelica/cdl/docx/FromModelica.VariableModification.docx b/test/FromModelica/cdl/docx/FromModelica.VariableModification.docx index 6bd784ed351a8924defdfe2bcb4fb37b272d6a5e..7a163eda292501b3466e13697fd080068c797597 100644 GIT binary patch delta 147 zcmcb!h3U=~Cf)#VW)?065GZn-x{>!kBQubm%+I6cBQubm%+I6cBQubm%+I6#-wrJCcfKK*He6r^rn43pfa$plY{2xL1=e6%Y9T~Ecwry_ D?+Z9e diff --git a/test/FromModelica/cdl/docx/FromModelica.package.docx b/test/FromModelica/cdl/docx/FromModelica.package.docx index 114ab21ce20965e210ab15bff71b451493b6b6de..38d3ada37f033ba23c6aece132a5180390e98922 100644 GIT binary patch delta 147 zcmX@Ni}BnpM&1B#W)?065a@E8x{>!kBQubm%+I6cBQubm%+I6!kBQubm%+I6cBQubm%+I6 Date: Wed, 21 Dec 2022 11:52:19 -0800 Subject: [PATCH 3/4] merging recent changes from master and regenerated test cases --- .../cdl/docx/FromModelica.Block1.docx | Bin 23323 -> 23323 bytes .../docx/FromModelica.BlockInputOutput.docx | Bin 33894 -> 33894 bytes .../docx/FromModelica.BlockWithBlock1.docx | Bin 40544 -> 40544 bytes .../docx/FromModelica.ConditionalBlock.docx | Bin 39632 -> 39632 bytes .../docx/FromModelica.CustomPWithLimiter.docx | Bin 56877 -> 56877 bytes .../docx/FromModelica.DynamicTextColor.docx | Bin 23381 -> 23381 bytes .../cdl/docx/FromModelica.EmptyEquation.docx | Bin 23337 -> 23337 bytes .../cdl/docx/FromModelica.Enable.docx | Bin 90825 -> 90825 bytes ...omModelica.MisplacedInfoWithComponent.docx | Bin 39962 -> 39962 bytes ...romModelica.MisplacedInfoWithEquation.docx | Bin 42129 -> 42129 bytes ...omModelica.MisplacedInfoWithParameter.docx | Bin 24093 -> 24093 bytes .../cdl/docx/FromModelica.MyController.docx | Bin 93187 -> 93187 bytes .../cdl/docx/FromModelica.NoClassComment.docx | Bin 24001 -> 24001 bytes .../docx/FromModelica.NoWithin-package.docx | Bin 23886 -> 23886 bytes .../cdl/docx/FromModelica.Parameter1.docx | Bin 24007 -> 24007 bytes ...delica.Parameter1WithVendorAnnotation.docx | Bin 24067 -> 24067 bytes .../cdl/docx/FromModelica.Parameter2.docx | Bin 26734 -> 26734 bytes .../cdl/docx/FromModelica.Parameter3.docx | Bin 24309 -> 24309 bytes .../FromModelica.ParameterWithAttributes.docx | Bin 24123 -> 24123 bytes ...FromModelica.ParameterWithDefaultName.docx | Bin 24102 -> 24102 bytes .../docx/FromModelica.ParameterWithInfo.docx | Bin 24081 -> 24081 bytes ...a.ParameterWithVendorAnnotationInInfo.docx | Bin 24135 -> 24135 bytes .../cdl/docx/FromModelica.PointList.docx | Bin 153191 -> 153191 bytes .../docx/FromModelica.RemovableInputs.docx | Bin 53972 -> 53972 bytes .../cdl/docx/FromModelica.SubController.docx | Bin 37305 -> 37305 bytes .../docx/FromModelica.TestEvaluation_1.docx | Bin 30441 -> 30441 bytes .../docx/FromModelica.TestEvaluation_2.docx | Bin 47334 -> 47334 bytes .../docx/FromModelica.TestEvaluation_3.docx | Bin 34974 -> 34974 bytes .../docx/FromModelica.TestEvaluation_4.docx | Bin 170816 -> 170816 bytes .../FromModelica.VariableModification.docx | Bin 39516 -> 39516 bytes .../docx/FromModelica.WithCDLElementary.docx | Bin 41380 -> 41380 bytes .../cdl/docx/FromModelica.package.docx | Bin 23886 -> 23886 bytes .../modelica/docx/FromModelica.docx | Bin 158028 -> 158028 bytes 33 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/FromModelica/cdl/docx/FromModelica.Block1.docx b/test/FromModelica/cdl/docx/FromModelica.Block1.docx index ee61af2f1202490637db2978f80bbf5312811d39..0365343ed84874d24be9a1397d30b0855ff23cdd 100644 GIT binary patch delta 131 zcmbQejdAuiMxFp~W)?065J-$&$iu{x7(1DdNeM`8HexDd1aX%#D}uNum`yoA^ndPI z-XP)G;p!mnk?hu9;V4@W6%=Iyq9#OvXFj{h#}3 z2}t-^gF1-I-2n Ad;kCd diff --git a/test/FromModelica/cdl/docx/FromModelica.BlockWithBlock1.docx b/test/FromModelica/cdl/docx/FromModelica.BlockWithBlock1.docx index 06ab89f3e835b07781c25bc9d19e2290dbcabc3c..2b958bb6886a4cea340ffa41b772404717f857dc 100644 GIT binary patch delta 131 zcmaE`hv~r{CY}IqW)?065QvFg$iu`G6FZrYNeM`8HexDd1aX%#D}uNum`yoA^ndRA zeIVfnv(!Oc&e=I&RpoQ+L83e67=frabId`M>Rdw*6*1QqL`|P-1EQ|Z1kcWwBrsHHjCM6)X*@&r-5yV}}tO(+sU^e9d(f_&c z_kn~T%u)w&IcMj9Rh7@N2Z`>OV+5k!%rOU1s&frNRK#3c5H)?S4T!or7c9p&F9-nZ Cpe`f; diff --git a/test/FromModelica/cdl/docx/FromModelica.ConditionalBlock.docx b/test/FromModelica/cdl/docx/FromModelica.ConditionalBlock.docx index 8e29422bc061edc5827dc031fe62e9699ca1e760..b564f719cc872f116fc0560e1a1968aabe6270a6 100644 GIT binary patch delta 131 zcmcbxmFdD(CY}IqW)?065NM2D$iu|c7(1DdNeM`8HexDd1aX%#D}uNum`yoA^nY&u zZjf-mbafE7a(WI})$(TU BEZ_hD delta 131 zcmcbxmFdD(CY}IqW)?065ZL3mkcWwBkK<%MCM6)X*@&r-5yV}}tO(+sU^e9d(f_&q zyFtPM)73%T%IP^^RnKSGgG4oE8iA;ondTsB>P$lrbz-J1h+>~*1EO4Kf#vFE1pxpL CpDxe< diff --git a/test/FromModelica/cdl/docx/FromModelica.CustomPWithLimiter.docx b/test/FromModelica/cdl/docx/FromModelica.CustomPWithLimiter.docx index d1cc15c7695c3fa55a509760fd0d66a34109084a..46aaa95ca1076692e63fe651448e3b962e84c363 100644 GIT binary patch delta 131 zcmZ3xhk5NDW}X0VW)?065O@~5kcWxsS?pv!CM6)X*@&r-5yV}}tO(+sU^e9d(f_&E zoC683y`>J~Ub~e8R^@WX9wgd&#|T92ykiccKHV_{QL1-sK~&0J8xXbVE?DmN-5>z4 CA~)Os delta 131 zcmZ3xhk5NDW}X0VW)?065Kwel$iu{>=roy+NeM`8HexDd1aX%#D}uNum`yoA^ndO( z=Rm@1Z>fX0*KXy2Rk_@;2Z^@cF#=IL@0f$APj?JKl diff --git a/test/FromModelica/cdl/docx/FromModelica.DynamicTextColor.docx b/test/FromModelica/cdl/docx/FromModelica.DynamicTextColor.docx index 1b8d5d72da1bb916532a9ddab93e9c17c0a7c4fd..029d5ee0b49a1f3df7103f2d4b3fb4f3741a215e 100644 GIT binary patch delta 131 zcmcb*jq&O>MxFp~W)?065YUTV$iu{>7dx4cNeM`8HexDd1aX%#D}uNum`yoA^ndOv z-XP(t;p!mnzwjKes+>rBkm%Y-BM|j4(i}udMHzx9-zZxU)e~g{qE1DD<(Q*`0B;5+ AwEzGB delta 131 zcmcb*jq&O>MxFp~W)?065Xg00$iu{x>o}Q@NeM`8HexDd1aX%#D}uNum`yoA^ndOv z-XP(t;p!mnzwjKes+>rBkm%Y-BM|j4(i}udMHzx9-zZxU)e~g{qE1DD<(Q*`0P~$F A^MH+%A#VA`4l@MhEqUJ?`<*r8s0RRs^ BDu)07 delta 131 zcmZ3vjdA5RMxFp~W)?065Ln~5kcWwBjpJlKCM6)X*@&r-5yV}}tO(+sU^e9d(f_$u zc!PvjhO2|Pm%?+vsvIKiL86V3Mj&cyq&bLs7ikEh6r*fGR6>*uh?*A#mb)Gm1OSX% BESCTP diff --git a/test/FromModelica/cdl/docx/FromModelica.Enable.docx b/test/FromModelica/cdl/docx/FromModelica.Enable.docx index 6c91e729d20adb6920f7dbdc341cc6b3524a135d..4241a1c762df24997a7f550b2bfc6d7f65785ec1 100644 GIT binary patch delta 144 zcmX?kl=b9MR-OQFW)?065I7RMkcWxsNbF=jCM6)X*@&r-5yV}}tO(+sU^e9d(#`+5 zxBus6^auvBr+daTssrimMe&R|AhpvUBrw{8XvIWEBM=>$$Y>6t`w|%qLG-~yMq3~~ SEs4$$Y>6t`w|%qLG-~yMq3~~ SEs4CM6)X*@&r-5yV}}tO(+sU^e9d(f_#x zrhv8WudDw7y{kZ5U)5r|qDV-BJo#TbGp(O6p$6%uO$q9(XFz-Ta?> z`+si6rWhc5dUFP&I*{JJCWA2tq;|Sg7Nb3gj?Q8<0@3|hjOHNvL>8kVi2j|$XbYmP RvKehabVW8qeq%Oc5CBlsDZ>B& delta 145 zcmZp^!PXFz-Ta?> z`+si6rWhc5dUFP&I*{JJCWA2tq;|Sg7Nb3gj?Q8<0@3|hjOHNvL>8kVi2j|$XbYmP RvKehabVW8qeq%Oc5CG&QE8_qF diff --git a/test/FromModelica/cdl/docx/FromModelica.NoClassComment.docx b/test/FromModelica/cdl/docx/FromModelica.NoClassComment.docx index 5462f4d88f62db6145a038f37d758f64f6035dfb..a774e4c85987205ff61c9c31e8b2456f9931d407 100644 GIT binary patch delta 131 zcmX@OoAKaoMxFp~W)?065a^6u$iu|c89SMeNeM`8HexDd1aX%#D}uNum`yoA^nY## zKaj9vlsbr;6_o>4btBpyBq|wW1fqOn%t2IJj3J2H8Dk5ge#F>-D6?3wTz+g207Q-} A2LJ#7 delta 131 zcmX@OoAKaoMxFp~W)?065IE+zkcWxsnB!zVCM6)X*@&r-5yV}}tO(+sU^e9d(f_#} z{6NBvQR*OWR#XmH)s1L-kf>yg5s31QF$Ym?F@_*&XN)a~`VnITqRe8!a`~}A0Kuy* A7XSbN diff --git a/test/FromModelica/cdl/docx/FromModelica.NoWithin-package.docx b/test/FromModelica/cdl/docx/FromModelica.NoWithin-package.docx index 51b77270c9d9f494da6c9c58b214f6f3bc4e911b..0e5572b668a44bd40ff3674aa24c50b4e477e0e2 100644 GIT binary patch delta 131 zcmX@Ni}BnpMxFp~W)?065U7e>$iu``6+4-aNeM`8HexDd1aX%#D}uNum`yoA^ndQN zz98Xqk?J7s_sATus?=zEkm#~#BM@~f+8jg)#~6Yrw-{Rx)f!_1q7KJ^<^IG30RV#3 BEH?lE delta 131 zcmX@Ni}BnpMxFp~W)?065ZLaxkcWwByW?a&CM6)X*@&r-5yV}}tO(+sU^e9d(f_&6 z`htYdMXH0i-y?Its#2rvL88l|jX>0`Xmb!H9AgNg++u7&RBMb4h&mhtmirSE1ONa4 BE=K?W diff --git a/test/FromModelica/cdl/docx/FromModelica.Parameter1.docx b/test/FromModelica/cdl/docx/FromModelica.Parameter1.docx index ba0248efdb37befa20f74c4ae259d5cf640c3e25..4314e07061618dae771abb01d406f89380fd8dc9 100644 GIT binary patch delta 131 zcmX@UoALN=MxFp~W)?065b%s$$iu|s89SMeNeM`8HexDd1aX%#D}uNum`yoA^nY$Q zKaj9{lsbr85S0T~buZc;Bq|?c1fqgt%t2I7j3J2HA7cxm{>9jUD4STYTxo0&0A(pB ARR910 delta 131 zcmX@UoALN=MxFp~W)?065NLN?$iu|c?l_r`NeM`8HexDd1aX%#D}uNum`yoA^nY$Q zKaj9{lsbr85S0T~buZc;Bq|?c1fqgt%t2I7j3J2HA7cxm{>9jUD4STYTxo0&0OkWJ AbpQYW diff --git a/test/FromModelica/cdl/docx/FromModelica.Parameter1WithVendorAnnotation.docx b/test/FromModelica/cdl/docx/FromModelica.Parameter1WithVendorAnnotation.docx index 6f22c414fe698398769a5d92290dfb46673fe1aa..af9dbab03194be22453685102db168cc873913da 100644 GIT binary patch delta 131 zcmZqP!`Qrskte{LnT3l11SZEWCJH{47S;g9bsESyy+{V}-08_#& A1poj5 delta 131 zcmZqP!`Qrskte{LnT3l11kO7yL!{NeM`8HexDd1aX%#D}uNum`yoA^ndOq zKag;9lsbsJCMpN4N-D-4BpMxK1fu$5%t6$N7()>CJH{47S;g9bsESyy+{V}-0L>yU A1poj5 diff --git a/test/FromModelica/cdl/docx/FromModelica.Parameter2.docx b/test/FromModelica/cdl/docx/FromModelica.Parameter2.docx index 8094bed643c2d6471a64f8aa98774589a93e8d6d..c966c59cc6598341c0be74a3797aee39eabef4a5 100644 GIT binary patch delta 131 zcmaENf$`l1MxFp~W)?065Lg(ykcWwBVeDi+CM6)X*@&r-5yV}}tO(+sU^e9d(f_&M zMu3FhrKp3r;;A`cRjq0EAkkxKMj+}}nmLFvPB#QmY3a5gYH7L+h@=B=NeM`8HexDd1aX%#D}uNum`yoA^ndOW ze~@r#v^t18FFFUTiYL|{BBQN9sH`}!+~T+(05uIE AtN;K2 diff --git a/test/FromModelica/cdl/docx/FromModelica.ParameterWithAttributes.docx b/test/FromModelica/cdl/docx/FromModelica.ParameterWithAttributes.docx index efef906defe7b235cc32673ca0a99d132a50676c..11be42157587fa7b9e5c93378d95bfe1e38b5562 100644 GIT binary patch delta 130 zcmdnJhjI5FMxFp~W)?065I7yXkcWxsbnIk4CM6)X*@&r-5yV}}tO(+sU^e9d(f_%3 z`GJIYN2!CjPoi?bs)AzdL86mmj6l@!7;_*sDb^6gF^;tbQAM#fAZkM_NNV!S*dPF2 Co-kej delta 130 zcmdnJhjI5FMxFp~W)?065MXm!$iu|M<}{g)NeM`8HexDd1aX%#D}uNum`yoA^ndPM zejwr9QR*P>lc*f9s-PHqkm%$XBM@~w#vDjZiZujrjALyRBWsbh?*S>mb(%g1OS9U BFuec( delta 131 zcmZ3shjG~+MxFp~W)?065a4xM$iu|M>ol2`KTPQD%%))kZ4_u5s2CpV-BKT#~6Yrxma5e6&q^uBaTaDvcO>kZ5L%5r~=_V-BLO#TbGp&RAOzNGqS|7?a{FV00R3tq Ad;kCd diff --git a/test/FromModelica/cdl/docx/FromModelica.ParameterWithVendorAnnotationInInfo.docx b/test/FromModelica/cdl/docx/FromModelica.ParameterWithVendorAnnotationInInfo.docx index 1cd31ae57ece0251e7aa6270356ce38f94e464e2..4f4c165e38ba79ed1d48cb2a04b87ce7636dd072 100644 GIT binary patch delta 131 zcmX@Uhw=CxMxFp~W)?065a^9v$iu|c8#|egNeM`8HexDd1aX%#D}uNum`yoA^ndPS zejwrFQR*P>ho~H|s<;??km&pvBM@~t#vDZP#2SJq`&e5LRTpamqV~js<-W!S0RXz? BEgJv; delta 131 zcmX@Uhw=CxMxFp~W)?065IE_$kcWxsq~l~hCM6)X*@&r-5yV}}tO(+sU^e9d(f_%R z`GJIwN2!CjAEI)=s^VhoL89|xj6l@o7;_NC6Ke>f>|<>~R9&nMh}shimirnT1OPNt BFB<>= diff --git a/test/FromModelica/cdl/docx/FromModelica.PointList.docx b/test/FromModelica/cdl/docx/FromModelica.PointList.docx index 0608663974dfd740afd9f755695fcad23a41152e..b8d2b2d208588241bd07b71aa2d1c18a2fa712c8 100644 GIT binary patch delta 149 zcmaF9hV%IvPM!d7W)?065U`0|$iu{B6FZrYNeM`8HexDd1aX%#D}uNum`yo=bn}1i z_W#_B+y8SjJ#z!{r#}y3QU}u81%jD!KdZx35XF7T21I#Y0?RdB3IYHU CWH0Uj diff --git a/test/FromModelica/cdl/docx/FromModelica.SubController.docx b/test/FromModelica/cdl/docx/FromModelica.SubController.docx index c0e2a7fdebb86ce8435d2be8af4f20752bdb3aa1..18099b8b9d896be63cf4900aab3b30332fd7b4c8 100644 GIT binary patch delta 131 zcmdnFm}%!?CY}IqW)?065KxU>$iu{>8atVfNeM`8HexDd1aX%#D}uNum`yoA^nY%P zCXldYpE`(})RzNRb)nxLBq}(;2t>I~Fb7d}6AVGr#tF6{>ca#Z5T!Q}ESEkp2mtk8 BCT#!! delta 131 zcmdnFm}%!?CY}IqW)?065J+)c$iu{x;y9U)NeM`8HexDd1aX%#D}uNum`yoA^nY%P zCXldYpE`(})RzNRb)nxLBq}(;2t>I~Fb7d}6AVGr#tF6{>ca#Z5T!Q}ESEkp2mpEo BD4hTR diff --git a/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_1.docx b/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_1.docx index 658ed2b7bd59770b16eed072dc3306d79851f16b..475ca5668a651520212eeddc5fa285ce5d0d30d7 100644 GIT binary patch delta 130 zcmaF)mht6VMxFp~W)?065LgzwkcWwBS?pv!CM6)X*@&r-5yV}}tO(+sU^e9d(f_$K z(m}$R#p)pLq~aWqs!65xAVJ4cBM?N BE>{2m delta 130 zcmaF)mht6VMxFp~W)?065P0OckcWxsk>g}OCM6)X*@&r-5yV}}tO(+sU^e9d(f_$K z(m}$R#p)pLq~aWqs!65xAVJ4cBM?30a4LAz;aV|1OWh} CZ!I7I delta 131 zcmaF%k?Gk-CY}IqW)?065SZ$?kcWwBs^ernCM6)X*@&r-5yV}}tO(+sU^e9d(f_$q zSAvAowyJ};{abUus{U@X2Z`EkHv&;b+s#4L>g|Rg>fUx+5GA|A21G^g0Lx9;5d;7v CST8^T diff --git a/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_3.docx b/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_3.docx index cdd864f35a9de4c83e469ec4ecd8bf7554f180f0..e0a1d7486b16c2d2bbf4582d455daf6865b41a21 100644 GIT binary patch delta 131 zcmbO?k!jvUCY}IqW)?065YUQU$iu{>6+4-aNeM`8HexDd1aX%#D}uNum`yoA^nY&I zN|3Nzt2&75-kJkewYAM2B>Jt*2t;YMn}ew2c0&*~t=$$xU2V4kQNkTyIiHRo0L;`S A)&Kwi delta 131 zcmbO?k!jvUCY}IqW)?065Xf{~$iu{x={T8>NeM`8HexDd1aX%#D}uNum`yoA^nY&I zN|3Nzt2&75-kJkewYAM2B>Jt*2t;YMn}ew2c0&*~t=$$xU2V4kQNkTyIiHRo08x4< A1^@s6 diff --git a/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_4.docx b/test/FromModelica/cdl/docx/FromModelica.TestEvaluation_4.docx index 9bea5b18c6f72f77a018fc35ca92795f7b332eca..1f5ef91020776b4ecfdd9a64d92b119084c063b7 100644 GIT binary patch delta 149 zcmX@GjqAWRE}j5yW)?065O@%~kcWxsLF{BcCM6)X*@&r-5yV}}tO(+sU^e9d(#`+5 z+y8SjZvW5Cw7(n3pMGFElRA*z{&G4~4oLm<@R>~ZAbQ43CL<7iW+sz4h-RI|WC)@y XW--}<=<-=iHXwTIEQtKOSxi9yake-1 delta 149 zcmX@GjqAWRE}j5yW)?065Ri0Q$iu`W=`@*-NeM`8HexDd1aX%#D}uNum`yo=bn}1i z_W#_B+y8Sj?e7NiryrQkqzkw XSxmMdx_lOs4T#=43nKq+7E=%amTD>1 diff --git a/test/FromModelica/cdl/docx/FromModelica.VariableModification.docx b/test/FromModelica/cdl/docx/FromModelica.VariableModification.docx index 7a163eda292501b3466e13697fd080068c797597..7efe904ecff4fdb96bb0679c03b2917dbbd5ca0b 100644 GIT binary patch delta 131 zcmcb!h3U=~CY}IqW)?065HN{d$iu{B5<8iXNeM`8HexDd1aX%#D}uNum`yoA^ndQ# zT_E8*)6_v+*6BH5RmC&xL84n`7=fr4Gt5Dh;!Hyj6*AKnL`|M)1EMa@1j}*F3IYJX Cz}2Z{cfZv>(Y7MO#m%ms!ZYR&>%5OsTj4TzFl2$l<47z6-K CVJtfU diff --git a/test/FromModelica/cdl/docx/FromModelica.package.docx b/test/FromModelica/cdl/docx/FromModelica.package.docx index 38d3ada37f033ba23c6aece132a5180390e98922..d1086c51a205f2c0c395e9b025e43c7ed179ad6e 100644 GIT binary patch delta 131 zcmX@Ni}BnpMxFp~W)?065b%jz$iu|s6FZrYNeM`8HexDd1aX%#D}uNum`yoA^ndQN zz98Xqk?J7s_sATus?=zEkm#~#BM@~f+8jg)#~6Yrw-{Rx)f!_1q7KJ^<^IG30RYy| BDOUgh delta 131 zcmX@Ni}BnpMxFp~W)?065a@DT$iu|cQU}u8zos(ffYeVNeM`8HexDd1aX%#D}uNum`yo=bn}1i z_W#_B+y8SjosIQU}u8zos(ffYeV$ From f4395692dd0fd631a126f7e7e68a783c3ed3b59c Mon Sep 17 00:00:00 2001 From: jayhulbl Date: Wed, 21 Dec 2022 21:41:28 -0800 Subject: [PATCH 4/4] improved readme --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 08459a91..cfc341f3 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Now the `\modelica-json` directory should have a new folder `html` and in the fo ## 3. How to use the parser -The parser can be run with the app.js file as follows: +The parser can be run with the `app.js` file as follows: ``` node app.js -f ``` @@ -86,17 +86,17 @@ The only required input is the path of the file or package to be parsed. ##### --output / -o -This parser takes a .mo file in input and has three possible outputs, that can be specified with the argument -o : +This parser takes a `.mo` file in input and has three possible outputs, that can be specified with the argument `-o` : - **raw-json** : detailed transcription of a Modelica file in JSON - **json**: simplified JSON format, easier to read and interpret - **html** (default): transcription from json with links for documentation - **docx** : transcription of the HTML documentation to an editable format -- **svg** : SVG diagram of the control sequence model in cdl model +- **svg** : SVG diagram of the control sequence model in `cdl` model ##### --mode / -m -We offer two different modes of translation that can be chosen with the argument -m : +We offer two different modes of translation that can be chosen with the argument `-m` : - **modelica** : Parses a Modelica package (must be a directory) - **cdl** (default) : Parses a CDL file. @@ -111,11 +111,11 @@ Specify the output directory. The default option is the current directory. ##### --evaluatePropagatedParameters / -p -Evaluate the propagated parameters. It would be needed for exporting CDL sequences to product lines. `false` is the default. +In `cdl` parsing mode, evaluate the propagated parameters. It would be needed for exporting CDL sequences to product lines. `false` is the default. ##### --evaluateExpressions / -e -Evaluate the mathematical expressions used in parameter assignment and class instantiation. It would be needed for exporting CDL sequences to product lines. `false` is the default. +In `cdl` parsing mode, evaluate the mathematical expressions used in parameter assignment and class instantiation. It would be needed for exporting CDL sequences to product lines. `false` is the default. ##### --strict