[[ LiveCode Builder ]] Tweak precedence values

runrevali · runrevali · commit 73870e77de2b · 2014-12-17T16:12:47.000Z
diff --git a/engine/src/canvas.mlc b/engine/src/canvas.mlc
@@ -80,7 +80,7 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectangleMake is prefix operator with precedence 4
+syntax RectangleMake is prefix operator with precedence 2
 	"rectangle" <mRect: Expression>
 begin
     MCCanvasRectangleMakeWithList(mRect, output)
@@ -105,14 +105,14 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectanglePropertyLeft is prefix operator with precedence 4
+syntax RectanglePropertyLeft is prefix operator with precedence 2
 	"the" "left" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetLeft(mRect, output)
 	MCCanvasRectangleSetLeft(input, mRect)
 end syntax
 
-syntax RectanglePropertyX is prefix operator with precedence 4
+syntax RectanglePropertyX is prefix operator with precedence 2
 	"the" "x" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetLeft(mRect, output)
@@ -138,14 +138,14 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectanglePropertyTop is prefix operator with precedence 4
+syntax RectanglePropertyTop is prefix operator with precedence 2
 	"the" "top" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetTop(mRect, output)
 	MCCanvasRectangleSetTop(input, mRect)
 end syntax
 
-syntax RectanglePropertyY is prefix operator with precedence 4
+syntax RectanglePropertyY is prefix operator with precedence 2
 	"the" "y" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetTop(mRect, output)
@@ -171,7 +171,7 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectanglePropertyRight is prefix operator with precedence 4
+syntax RectanglePropertyRight is prefix operator with precedence 2
 	"the" "right" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetRight(mRect, output)
@@ -197,7 +197,7 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectanglePropertyBottom is prefix operator with precedence 4
+syntax RectanglePropertyBottom is prefix operator with precedence 2
 	"the" "bottom" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetBottom(mRect, output)
@@ -223,7 +223,7 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectanglePropertyWidth is prefix operator with precedence 4
+syntax RectanglePropertyWidth is prefix operator with precedence 2
 	"the" "width" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetWidth(mRect, output)
@@ -249,7 +249,7 @@ Example:
 Tags:		Canvas
 */
 
-syntax RectanglePropertyHeight is prefix operator with precedence 4
+syntax RectanglePropertyHeight is prefix operator with precedence 2
 	"the" "height" "of" <mRect:Expression>
 begin
 	MCCanvasRectangleGetHeight(mRect, output)
@@ -282,7 +282,7 @@ Example:
 Tags:	Canvas
 */
 
-syntax PointMake is prefix operator with precedence 4
+syntax PointMake is prefix operator with precedence 2
 	"point" <mPoint: Expression>
 begin
 	MCCanvasPointMakeWithList(mPoint, output)
@@ -304,7 +304,7 @@ Example:
 Tags:	Canvas
 */
 
-syntax PointPropertyX is prefix operator with precedence 4
+syntax PointPropertyX is prefix operator with precedence 2
 	"the" "x" "of" <mPoint: Expression>
 begin
 	MCCanvasPointGetX(mPoint, output)
@@ -327,7 +327,7 @@ Example:
 Tags:	Canvas
 */
 
-syntax PointPropertyY is prefix operator with precedence 4
+syntax PointPropertyY is prefix operator with precedence 2
 	"the" "y" "of" <mPoint: Expression>
 begin
 	MCCanvasPointGetY(mPoint, output)
@@ -1451,13 +1451,13 @@ public foreign handler MCCanvasImageGetHeight(in pImage as Image, out rHeight as
 public foreign handler MCCanvasImageGetPixels(in pImage as Image, out rPixels as data) as undefined binds to "<builtin>"
 // TODO - add image frame index property?
 
-syntax ImageWidthProperty is prefix operator with precedence 4
+syntax ImageWidthProperty is prefix operator with precedence 2
 	"the" "width" "of" <mImage: Expression>
 begin
 	MCCanvasImageGetWidth(mImage, output)
 end syntax
 
-syntax ImageHeightProperty is prefix operator with precedence 4
+syntax ImageHeightProperty is prefix operator with precedence 2
 	"the" "height" "of" <mImage: Expression>
 begin
 	MCCanvasImageGetHeight(mImage, output)
diff --git a/libscript/src/arithmetic.mlc b/libscript/src/arithmetic.mlc
@@ -227,7 +227,7 @@ Example:
 Tags: Math
 */
 
-syntax PlusOperator is left binary operator with precedence 2
+syntax PlusOperator is left binary operator with precedence 4
     <Left: Expression> "+" <Right: Expression>
 begin
     MCArithmeticEvalNumberPlusNumber(Left, Right, output)
@@ -247,7 +247,7 @@ Example:
 Tags: Math
 */
 
-syntax MinusOperator is left binary operator with precedence 2
+syntax MinusOperator is left binary operator with precedence 4
     <Left: Expression> "-" <Right: Expression>
 begin
     MCArithmeticEvalNumberMinusNumber(Left, Right, output)
@@ -268,7 +268,7 @@ Tags: Math
 
 */
 
-syntax TimesOperator is left binary operator with precedence 1
+syntax TimesOperator is left binary operator with precedence 3
     <Left: Expression> "*" <Right: Expression>
 begin
     MCArithmeticEvalNumberTimesNumber(Left, Right, output)
@@ -288,7 +288,7 @@ Example:
 Tags: Math
 */
 
-syntax OverOperator is left binary operator with precedence 1
+syntax OverOperator is left binary operator with precedence 3
     <Left: Expression> "/" <Right: Expression>
 begin
     MCArithmeticEvalNumberOverNumber(Left, Right, output)
@@ -312,7 +312,7 @@ Returns the remainder on dividing <Left> by <Right>
 
 */
 
-syntax ModOperator is neutral binary operator with precedence 4
+syntax ModOperator is neutral binary operator with precedence 3
     <Left: Expression> "mod" <Right: Expression>
 begin
     MCArithmeticEvalNumberModNumber(Left, Right, output)
@@ -340,7 +340,7 @@ successive values of x wrap y cycle through the sequence 1, 2, ..., y.
 
 */
 
-syntax WrapOperator is neutral binary operator with precedence 4
+syntax WrapOperator is neutral binary operator with precedence 3
     <Left: Expression> "wrap" <Right: Expression>
 begin
     MCArithmeticEvalNumberWrapNumber(Left, Right, output)
@@ -356,7 +356,7 @@ Right:      An expression that evaluates to a number.
 Returns: 	True if <Left> is greater than <Right>, and false otherwise.
 */
 
-syntax NumberIsGreaterThanNumber is neutral binary operator with precedence 3
+syntax NumberIsGreaterThanNumber is neutral binary operator with precedence 5
     <Left: Expression> ">" <Right: Expression>
 begin
     MCArithmeticEvalNumberIsGreaterThanNumber(Left, Right, output)
@@ -370,7 +370,7 @@ Right:      An expression that evaluates to a number.
 Returns: 	True if <Left> is greater than or equal to <Right>, and false otherwise.
 */
 
-syntax NumberIsGreaterThanOrEqualToNumber is neutral binary operator with precedence 3
+syntax NumberIsGreaterThanOrEqualToNumber is neutral binary operator with precedence 5
     <Left: Expression> ">=" <Right: Expression>
 begin
     MCArithmeticEvalNumberIsGreaterThanOrEqualToNumber(Left, Right, output)
@@ -388,7 +388,7 @@ Description:
 Tags: Math
 */
 
-syntax NumberIsLessThanNumber is neutral binary operator with precedence 3
+syntax NumberIsLessThanNumber is neutral binary operator with precedence 5
     <Left: Expression> "<" <Right: Expression>
 begin
     MCArithmeticEvalNumberIsLessThanNumber(Left, Right, output)
@@ -407,7 +407,7 @@ Tags: Math
 */
 
 
-syntax NumberIsLessThanOrEqualToNumber is neutral binary operator with precedence 3
+syntax NumberIsLessThanOrEqualToNumber is neutral binary operator with precedence 5
     <Left: Expression> "<=" <Right: Expression>
 begin
     MCArithmeticEvalNumberIsLessThanOrEqualToNumber(Left, Right, output)
@@ -427,7 +427,7 @@ Description:
 Tags: Math
 */
 
-syntax NumberIsEqualToNumber is neutral binary operator with precedence 4
+syntax NumberIsEqualToNumber is neutral binary operator with precedence 6
     <Left: Expression> "=" <Right: Expression>
 begin
     MCArithmeticEvalEqualToNumber(Left, Right, output)
@@ -448,7 +448,7 @@ References: NumberIsEqualToNumber (operator)
 Tags: Math
 */
 
-syntax NumberIsNumber is neutral binary operator with precedence 5
+syntax NumberIsNumber is neutral binary operator with precedence 7
     <Left: Expression> "is" <Right: Expression>
 begin
     MCArithmeticEvalEqualToNumber(Left, Right, output)
@@ -470,7 +470,7 @@ Tags: Math
 */
 
 
-syntax NumberIsNotNumber is neutral binary operator with precedence 5
+syntax NumberIsNotNumber is neutral binary operator with precedence 7
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCArithmeticEvalNotEqualToNumber(Left, Right, output)
diff --git a/libscript/src/binary.mlc b/libscript/src/binary.mlc
@@ -95,7 +95,7 @@ Performs a byte by byte comparison of <Left> and <Right>, returning false if the
 Tags: Binary
 */
 
-syntax DataIsData is neutral binary operator with precedence 5
+syntax DataIsData is neutral binary operator with precedence 7
     <Left: Expression> "is" <Right: Expression>
 begin
     MCBinaryEvalIsEqualTo(Left, Right, output)
@@ -115,7 +115,7 @@ Performs a byte by byte comparison of <Left> and <Right>, returning true if ther
 Tags: Binary
 */
 
-syntax DataIsNotData is neutral binary operator with precedence 5
+syntax DataIsNotData is neutral binary operator with precedence 7
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCBinaryEvalIsNotEqualTo(Left, Right, output)
@@ -136,7 +136,7 @@ Description:
 Tags: Binary
 */
 
-syntax DataIsLessThanData is neutral binary operator with precedence 3
+syntax DataIsLessThanData is neutral binary operator with precedence 5
     <Left: Expression> "<" <Right: Expression>
 begin
     MCBinaryEvalIsLessThan(Left, Right, output)
@@ -157,7 +157,7 @@ Description:
 Tags: Binary
 */
 
-syntax DataIsGreaterThanData is neutral binary operator with precedence 3
+syntax DataIsGreaterThanData is neutral binary operator with precedence 5
     <Left: Expression> ">" <Right: Expression>
 begin
     MCBinaryEvalIsGreaterThan(Left, Right, output)
diff --git a/libscript/src/list.mlc b/libscript/src/list.mlc
@@ -350,7 +350,7 @@ In particular, this means that comparison between string elements is case sensit
 Tags: Lists
 */
 
-syntax ListIsList is neutral binary operator with precedence 5
+syntax ListIsList is neutral binary operator with precedence 7
     <Left: Expression> "is" <Right: Expression>
 begin
     MCListEvalIsEqualTo(Left, Right, output)
@@ -379,7 +379,7 @@ In particular, this means that comparison between string elements is case sensit
 Tags: Lists
 */
 
-syntax ListIsNotList is neutral binary operator with precedence 5
+syntax ListIsNotList is neutral binary operator with precedence 7
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCListEvalIsNotEqualTo(Left, Right, output)
diff --git a/libscript/src/logic.mlc b/libscript/src/logic.mlc
@@ -65,7 +65,7 @@ Tags: Logic
 	
 */
 
-syntax LogicNot is prefix operator with precedence 3
+syntax LogicNot is prefix operator with precedence 6
     "not" <Operand: Expression>
 begin
     MCLogicEvalNot(Operand, output)
@@ -89,7 +89,7 @@ Example:
 Tags: Logic
 */
 
-syntax BooleanIsEqualToBoolean is neutral binary operator with precedence 5
+syntax BooleanIsEqualToBoolean is neutral binary operator with precedence 7
     <Left: Expression> "is" <Right: Expression>
 begin
     MCLogicEvalIsEqualTo(Left, Right, output)
@@ -111,7 +111,7 @@ Example:
 Tags: Logic
 */
 
-syntax BooleanIsNotEqualToBoolean is neutral binary operator with precedence 5
+syntax BooleanIsNotEqualToBoolean is neutral binary operator with precedence 7
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCLogicEvalIsNotEqualTo(Left, Right, output)
diff --git a/libscript/src/math.mlc b/libscript/src/math.mlc
@@ -62,7 +62,7 @@ Example:
 Tags: Math
 */
 
-syntax PowOperator is left binary operator with precedence 2
+syntax PowOperator is left binary operator with precedence 1
     <Left: Expression> "^" <Right: Expression>
 begin
     MCMathEvalNumberToPowerOfNumber(Left, Right, output)
@@ -260,7 +260,7 @@ Returns: 	The value of <Left>, if it is less than the value of <Right>, and the
 Tags: Math
 */
 
-syntax MinOperator is prefix operator with precedence 1
+syntax MinOperator is prefix operator with precedence 5
     "the" "min" "of" <Left: Expression> "and" <Right: Expression>
 begin
     MCMathEvalMinNumber(Left, Right, output)
@@ -276,7 +276,7 @@ Returns: 	The value of <Left>, if it is greater than the value of <Right>, and t
 Tags: Math
 */
 
-syntax MaxOperator is prefix operator with precedence 1
+syntax MaxOperator is prefix operator with precedence 5
     "the" "max" "of" <Left: Expression> "and" <Right: Expression>
 begin
     MCMathEvalMaxNumber(Left, Right, output)
diff --git a/libscript/src/module-type.cpp b/libscript/src/module-type.cpp
@@ -28,7 +28,7 @@ extern "C" MC_DLLEXPORT void MCTypeEvalIsNotEmpty(MCValueRef p_target, bool& r_o
 
 extern "C" MC_DLLEXPORT void MCTypeEvalIsDefined(MCValueRef *p_target, bool& r_output)
 {
-    r_output = p_target != nil;
+    r_output = (p_target != nil && *p_target != kMCNull);
 }
 
 extern "C" MC_DLLEXPORT void MCTypeEvalIsNotDefined(MCValueRef *p_target, bool& r_output)
diff --git a/libscript/src/string.mlc b/libscript/src/string.mlc
@@ -219,7 +219,7 @@ The ```is``` operator is case sensitive.
 Tags: Strings
 */
 
-syntax StringIsString is neutral binary operator with precedence 5
+syntax StringIsString is neutral binary operator with precedence 7
     <Left: Expression> "is" <Right: Expression>
 begin
     MCStringEvalIsEqualTo(Left, Right, output)
@@ -240,7 +240,7 @@ The ```is not``` operator is case sensitive.
 Tags: Strings
 */
 
-syntax StringIsNotString is neutral binary operator with precedence 5
+syntax StringIsNotString is neutral binary operator with precedence 7
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCStringEvalIsNotEqualTo(Left, Right, output)
@@ -261,7 +261,7 @@ Description:
 Tags: Strings
 */
 
-syntax StringIsLessThanString is neutral binary operator with precedence 3
+syntax StringIsLessThanString is neutral binary operator with precedence 5
     <Left: Expression> "<" <Right: Expression>
 begin
     MCStringEvalIsLessThan(Left, Right, output)
@@ -281,7 +281,7 @@ Description:
 Tags: Strings
 */
 
-syntax StringIsGreaterThanString is neutral binary operator with precedence 3
+syntax StringIsGreaterThanString is neutral binary operator with precedence 5
     <Left: Expression> ">" <Right: Expression>
 begin
     MCStringEvalIsGreaterThan(Left, Right, output)
diff --git a/toolchain/lc-compile/test.mlc b/toolchain/lc-compile/test.mlc

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ extern "C" MC_DLLEXPORT void MCTypeEvalIsNotEmpty(MCValueRef p_target, bool& r_o`
`28`	`28`
`29`	`29`	`extern "C" MC_DLLEXPORT void MCTypeEvalIsDefined(MCValueRef *p_target, bool& r_output)`
`30`	`30`	`{`
`31`		`- r_output = p_target != nil;`
	`31`	`+ r_output = (p_target != nil && *p_target != kMCNull);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`extern "C" MC_DLLEXPORT void MCTypeEvalIsNotDefined(MCValueRef *p_target, bool& r_output)`