Extended Pascal abstractor

Author: kevinlano

cg/JS2UML.cstl

@@ -933,6 +933,8 @@ _1 |-->_1
 _* |-->_
 
 numericLiteral::
+_1 |-->("_1"->toReal())<when> _1 matches .*E.*
+_1 |-->("_1"->toReal())<when> _1 matches .*e.*
 _1 |-->_1
 
 bigintLiteral::

cg/cobol2UML.cstl

@@ -1592,20 +1592,21 @@ _1 _* TO _3  |-->    _3 := (_3 + _1 + _*`sum)_3`roundFunction ;\n
 
 
 addToGivingStatement::
-_1 TO _2 GIVING _3  |-->    _2 := _2 + _1 ;\n    _3 := _2_3`roundFunction;\n
-_1 _* TO _3 GIVING _4  |-->    _3 := _3 + (_1 + _*`sum);\n    _4 := _3_4`roundFunction;\n
+_1 TO _2 GIVING _3  |-->    _3 := (_1 + _2)_3`roundFunction;\n
+_1 _* TO _3 GIVING _4  |-->    _4 := _3 + (_1 + _*`sum)_4`roundFunction;\n
 _1 _* TO _3 GIVING _4 _+  |-->    (var _addGivingTmp : double ; _addGivingTmp := _3 + (_1 + _*`sum) ;\n      _4 := _addGivingTmp_4`roundFunction;\n_+`addGivingAssigns      skip) ;\n
 _1 _* GIVING _3 _+ |-->    (var _addGivingTmp : double ; _addGivingTmp := _1 + _*`sum ;\n      _3 := _addGivingTmp_3`roundFunction ; \n_+`addGivingAssigns      skip) ;\n
 _1 _* GIVING _3  |-->    _3 := (_1 + _*`sum)_3`roundFunction ;\n
 
 
 overflowTest::
-_1 TO _2 GIVING _3  |-->MathLib.isIntegerOverflow(_2, _2`integerWidth) or MathLib.isIntegerOverflow(_3, _3`integerWidth)
-_1 _* TO _3 GIVING _4  |-->MathLib.isIntegerOverflow(_3, _3`integerWidth) or MathLib.isIntegerOverflow(_4, _4`integerWidth)
-_1 _* TO _3 GIVING _4 _+  |-->MathLib.isIntegerOverflow(_3, _3`integerWidth) or MathLib.isIntegerOverflow(_4, _4`integerWidth)_+`overflowItemTest
+_1 TO _2 GIVING _3  |-->MathLib.isIntegerOverflow(_3, _3`integerWidth)
+_1 _* TO _3 GIVING _4  |-->MathLib.isIntegerOverflow(_4, _4`integerWidth)
+_1 _* TO _3 GIVING _4 _+  |-->MathLib.isIntegerOverflow(_4, _4`integerWidth)_+`overflowItemTest
 _1 _* GIVING _3 _+ |-->MathLib.isIntegerOverflow(_3, _3`integerWidth)_+`overflowItemTest
 _1 _* GIVING _3  |-->MathLib.isIntegerOverflow(_3, _3`integerWidth)
 
+
 overflowItemTest::
 _1 |--> or MathLib.isIntegerOverflow(_1, _1`integerWidth)
 

cg/mathocl2ocl.cstl

@@ -373,6 +373,8 @@ max ( _1 ) |-->(_1)->max()
 
 var ( _1 ) |-->_1.variance()
 
+len ( _1 ) |-->(_1)->size()
+
 Date ( _1 ) |-->OclDate.newOclDate_String(_1)
 Time ( _1 ) |-->OclDate.newOclDate_Time(_1)
 
@@ -381,6 +383,8 @@ Binomial ( _1 ) |-->Excel.Binom_Dist_Range(_1`third,_1`last,_1`first,_1`third)
 bondPrice ( _1 ) |-->FinanceLib.bondPrice(_1)
 bondPriceClean ( _1 ) |-->FinanceLib.bondPriceClean(_1)
 
+determinant ( _1 ) |-->MatrixLib.determinant(_1)
+
 _1 ( _2 ) |-->_1(_2)
 _1 ( ) |-->_1()