Commite4cf4a2

andrewjkennedy

committed

Small cleanup of units pickling

1 parentdb6643a commite4cf4a2Copy full SHA for e4cf4a2

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1438,8 +1438,7 @@ let p_measure_intpower unt n st =`
`1438`	`1438`	`// Pickle a rational power of a unit-of-measure variable or constructor`
`1439`	`1439`	`let recp_measure_power unt q st=`
`1440`	`1440`	`if q= ZeroRationalthen p_measure_one st`
`1441`		`-else`
`1442`		`-if GetDenominator q=1`
	`1441`	`+elif GetDenominator q=1`
`1443`	`1442`	`then p_measure_intpower unt(GetNumerator q) st`
`1444`	`1443`	`else p_byte5 st; p_measure_varcon unt st; p_rational q st`
`1445`	`1444`
`@@ -1449,11 +1448,11 @@ let rec p_measure_power unt q st =`
`1449`	`1448`	`let recp_normalized_measure unt st=`
`1450`	`1449`	`letunt= stripUnitEqnsAuxfalse unt`
`1451`	`1450`	`match untwith`
`1452`		`-\| MeasureCon tcref->p_measurecon tcref st`
	`1451`	`+\| MeasureCon tcref->p_measure_con tcref st`
`1453`	`1452`	`\| MeasureInv x-> p_byte1 st; p_normalized_measure x st`
`1454`	`1453`	`\| MeasureProd(x1,x2)-> p_byte2 st; p_normalized_measure x1 st; p_normalized_measure x2 st`
`1455`		`-\| MeasureVar v->p_measurevar v st`
`1456`		`-\| MeasureOne-> p_measure_one`
	`1454`	`+\| MeasureVar v->p_measure_var v st`
	`1455`	`+\| MeasureOne-> p_measure_one st`
`1457`	`1456`	`\| MeasureRationalPower(x,q)-> p_measure_power x q st`
`1458`	`1457`
`1459`	`1458`	`// By normalizing the unit-of-measure and treating integer powers as a special case,`

Comments

(0)