[[ Script ]] Tweaks to mlc files to make them compile.

runrevmark · runrevmark · commit 3f664eb7ba23 · 2014-11-27T11:42:57.000Z
diff --git a/libscript/src/encoding.mlc b/libscript/src/encoding.mlc
@@ -12,14 +12,14 @@ foreign handler ExecDecodeUsingBase64(in Source as string, out Value as data) as
 foreign handler ExecEncodeUsingBinary(in Source as data, in Format as string, out Value as string) as undefined binds to "<builtin>"
 foreign handler ExecDecodeUsingBinary(in Source as string, in Format as string, out Value as data) as undefined binds to "<builtin>"
 
-foreign handler ExecEncodeUsingUTF8(in Target as string, out Target as data) as undefined binds to "<builtin>"
-foreign handler ExecDecodeUsingUTF8(in Target as data, out Target as string) as undefined binds to "<builtin>"
-foreign handler ExecEncodeUsingUTF16(in Target as string, out Target as data) as undefined binds to "<builtin>"
-foreign handler ExecDecodeUsingUTF16(in Target as data, out Target as string) as undefined binds to "<builtin>"
-foreign handler ExecEncodeUsingUTF32(in Target as string, out Target as data) as undefined binds to "<builtin>"
-foreign handler ExecDecodeUsingUTF32(in Target as data, out Target as string) as undefined binds to "<builtin>"
-foreign handler ExecEncodeUsingASCII(in Target as string, out Target as data) as undefined binds to "<builtin>"
-foreign handler ExecDecodeUsingASCII(in Target as data, out Target as string) as undefined binds to "<builtin>"
+foreign handler ExecEncodeUsingUTF8(in Source as string, out Target as data) as undefined binds to "<builtin>"
+foreign handler ExecDecodeUsingUTF8(in Source as data, out Target as string) as undefined binds to "<builtin>"
+foreign handler ExecEncodeUsingUTF16(in Source as string, out Target as data) as undefined binds to "<builtin>"
+foreign handler ExecDecodeUsingUTF16(in Source as data, out Target as string) as undefined binds to "<builtin>"
+foreign handler ExecEncodeUsingUTF32(in Source as string, out Target as data) as undefined binds to "<builtin>"
+foreign handler ExecDecodeUsingUTF32(in Source as data, out Target as string) as undefined binds to "<builtin>"
+foreign handler ExecEncodeUsingASCII(in Source as string, out Target as data) as undefined binds to "<builtin>"
+foreign handler ExecDecodeUsingASCII(in Source as data, out Target as string) as undefined binds to "<builtin>"
 
 foreign handler EvalURLEncoded(in Target as string, out Value as string) as undefined binds to "<builtin>"
 foreign handler EvalURLDecoded(in Target as string, out Value as string) as undefined binds to "<builtin>"
@@ -136,13 +136,13 @@ end syntax
 
 --
 
-syntax URLEncoded is prefix operator
+syntax URLEncoded is prefix operator with precedence 3
     "the" "url" "encoded" "of" <Target: Expression>
 begin
     EvalURLEncoded(Target, output)
 end syntax
 
-syntax URLDecoded is statement
+syntax URLDecoded is prefix operator with precedence 3
     "the" "url" "decoded" "of" <Target: Expression>
 begin
     EvalURLDecoded(Target, output)
diff --git a/libscript/src/item.mlc b/libscript/src/item.mlc
@@ -7,45 +7,46 @@ foreign handler StoreItemRangeOf(in Value as string, in Start as index, in Finis
 
 foreign handler EvalNumberOfItemsIn(in Target as string, out Count as index) as undefined binds to "<builtin>"
 
-foreign handler EvalIsAmongTheItemsOf(in Needle as string, in Target as string, in IsNot as bool, out Result as bool) as undefined binds to "<builtin>"
+foreign handler EvalIsAmongTheItemsOf(in Needle as string, in Target as string, out Result as bool) as undefined binds to "<builtin>"
+foreign handler EvalIsNotAmongTheItemsOf(in Needle as string, in Target as string, out Result as bool) as undefined binds to "<builtin>"
 
 foreign handler EvalOffsetOfItemIn(in Needle as string, in Target as string, out Offset as index) as undefined binds to "<builtin>"
 
 --
 
-syntax SingletonItemOf is left unary operator with precedence 1
+syntax SingletonItemOf is prefix operator with precedence 1
 	"item" <Index: Expression> "of" <Target: Expression>
 begin
 	FetchItemOf(Index, Target, output)
 	StoreItemOf(input, Index, Target)
 end syntax
 
-syntax RangeItemOf is left unary operator with precedence 1
+syntax RangeItemOf is prefix operator with precedence 1
 	"item" <Start: Expression> "to" <Finish: Expression> "of" <Target: Expression>
 begin
 	FetchItemRangeOf(Start, Finish, Target, output)
 	StoreItemRangeOf(input, Start, Finish, Target)
 end syntax
 
-syntax CountItemsOf is left unary operator with precedence 1
+syntax CountItemsOf is prefix operator with precedence 1
 	"the" "number" "of" "items" "in" <Target: Expression>
 begin
 	EvalNumberOfItemsIn(Target, output)
 end syntax
 
-syntax AmongItemsOf is left unary operator with precedence 1
+syntax AmongItemsOf is left binary operator with precedence 1
 	<Needle: Expression> "is" "among" "the" "items" "of" <Target: Expression>
 begin
 	EvalIsAmongTheItemsOf(Needle, Target, output)
 end syntax
 
-syntax NotAmongItemsOf is left unary operator with precedence 1
+syntax NotAmongItemsOf is left binary operator with precedence 1
 	<Needle: Expression> "is" "not" "among" "the" "items" "of" <Target: Expression>
 begin
 	EvalIsNotAmongTheItemsOf(Needle, Target, output)
 end syntax
 
-syntax ItemOffset is left unary operator with precedence 1
+syntax ItemOffset is prefix operator with precedence 1
 	"the" "offset" "of" "item" <Needle: Expression> "in" <Target: Expression>
 begin
 	EvalOffsetOfItemIn(Needle, Target, output)
diff --git a/libscript/src/itemchunk.mlc b/libscript/src/itemchunk.mlc
@@ -13,39 +13,39 @@ foreign handler EvalOffsetOfItemIn(in Needle as string, in Target as string, out
 
 --
 
-syntax SingletonItemOf is left unary operator with precedence 1
+syntax SingletonItemOf is prefix operator with precedence 1
 	"item" <Index: Expression> "of" <Target: Expression>
 begin
 	FetchItemOf(Index, Target, output)
 	StoreItemOf(input, Index, Target)
 end syntax
 
-syntax RangeItemOf is left unary operator with precedence 1
+syntax RangeItemOf is prefix operator with precedence 1
 	"item" <Start: Expression> "to" <Finish: Expression> "of" <Target: Expression>
 begin
 	FetchItemRangeOf(Start, Finish, Target, output)
 	StoreItemRangeOf(input, Start, Finish, Target)
 end syntax
 
-syntax CountItemsOf is left unary operator with precedence 1
+syntax CountItemsOf is prefix operator with precedence 1
 	"the" "number" "of" "items" "in" <Target: Expression>
 begin
 	EvalNumberOfItemsIn(Target, output)
 end syntax
 
-syntax AmongItemsOf is left unary operator with precedence 1
+syntax AmongItemsOf is left binary operator with precedence 1
 	<Needle: Expression> "is" "among" "the" "items" "of" <Target: Expression>
 begin
-	EvalIsAmongTheItemsOf(Needle, Target, output)
+	EvalIsAmongTheItemsOf(Needle, Target, false, output)
 end syntax
 
-syntax NotAmongItemsOf is left unary operator with precedence 1
+syntax NotAmongItemsOf is left binary operator with precedence 1
 	<Needle: Expression> "is" "not" "among" "the" "items" "of" <Target: Expression>
 begin
-	EvalIsNotAmongTheItemsOf(Needle, Target, output)
+	EvalIsAmongTheItemsOf(Needle, Target, true, output)
 end syntax
 
-syntax ItemOffset is left unary operator with precedence 1
+syntax ItemOffset is prefix operator with precedence 1
 	"the" "offset" "of" "item" <Needle: Expression> "in" <Target: Expression>
 begin
 	EvalOffsetOfItemIn(Needle, Target, output)
diff --git a/libscript/src/line.mlc b/libscript/src/line.mlc
@@ -34,9 +34,9 @@ begin
 end syntax
 
 syntax AmongLinesOf is neutral binary operator with precedence 1
-	<Needle: Expression> "is" ["not <IsNot=true>] "among" "the" "lines" "of" <Target: Expression>
+	<Needle: Expression> "is" [ "not" <IsNot=true> ] "among" "the" "lines" "of" <Target: Expression>
 begin
-	EvalIsAmongTheLinesOf(Needle, Target, output)
+	EvalIsAmongTheLinesOf(Needle, Target, IsNot, output)
 end syntax
 
 syntax LineOffset is prefix operator with precedence 1
diff --git a/libscript/src/linechunk.mlc b/libscript/src/linechunk.mlc
@@ -34,9 +34,9 @@ begin
 end syntax
 
 syntax AmongLinesOf is neutral binary operator with precedence 1
-	<Needle: Expression> "is" ["not <IsNot=true>] "among" "the" "lines" "of" <Target: Expression>
+	<Needle: Expression> "is" ["not" <IsNot=true>] "among" "the" "lines" "of" <Target: Expression>
 begin
-	EvalIsAmongTheLinesOf(Needle, Target, output)
+	EvalIsAmongTheLinesOf(Needle, Target, IsNot, output)
 end syntax
 
 syntax LineOffset is prefix operator with precedence 1
diff --git a/libscript/src/list.mlc b/libscript/src/list.mlc
@@ -61,7 +61,7 @@ Target:         An expression which evaluates to a list.
 syntax PushOntoList is statement
     "push" <Value: Expression> "onto" [ "front" "of" <IsFront=true> | "back" "of" <IsFront=false> ] <Target:Expression>
 begin
-    MCListExecPushSingleElementOnto(Value, isFront, Target)
+    MCListExecPushSingleElementOnto(Value, IsFront, Target)
 end syntax
 
 /* 
diff --git a/libscript/src/logic.mlc b/libscript/src/logic.mlc
@@ -46,10 +46,10 @@ output:     If the operand expression evaluates to true, the value of the expres
             Otherwise, the value of the expression is true.
 */
 
-syntax LogicNot is prefix operator of precedence 1
+syntax LogicNot is prefix operator with precedence 1
     "not" <Operand: Expression>
 begin
-    EvalNot(Operand, output)
+    MCLogicEvalNot(Operand, output)
 end syntax
 
 --
diff --git a/libscript/src/math.mlc b/libscript/src/math.mlc
@@ -59,7 +59,7 @@ Right:      An expression that evaluates to a number.
 output:     The result of raising <Left> to the power <Right>.
 */
 
-syntax ExpOperator is left binary operator with precedence 2
+syntax PowOperator is left binary operator with precedence 2
     <Left: Expression> "^" <Right: Expression>
 begin
     EvalIntegerToPowerOfInteger(Left, Right, output)
@@ -122,9 +122,9 @@ Operand:    An expression that evaluates to a number.
 syntax Base10LogOperator is prefix operator with precedence 1
     "the" "log" "of" <Operand: Expression>
 begin
-    EvalLogInteger(Operand, output)
-    EvalLogReal(Operand, output)
-    EvalLogNumber(Operand, output)
+    EvalBase10LogInteger(Operand, output)
+    EvalBase10LogReal(Operand, output)
+    EvalBase10LogNumber(Operand, output)
 end syntax
 
 --
diff --git a/libscript/src/segmentchunk.mlc b/libscript/src/segmentchunk.mlc
@@ -14,39 +14,39 @@ foreign handler EvalOffsetOfSegmentIn(in Needle as string, in Target as string,
 
 --
 
-syntax SingletonSegmentOf is left unary operator with precedence 1
+syntax SingletonSegmentOf is prefix operator with precedence 1
 	"segment" <Index: Expression> "of" <Target: Expression>
 begin
 	FetchSegmentOf(Index, Target, output)
 	StoreSegmentOf(input, Index, Target)
 end syntax
 
-syntax RangeSegmentOf is left unary operator with precedence 1
+syntax RangeSegmentOf is prefix operator with precedence 1
 	"segment" <Start: Expression> "to" <Finish: Expression> "of" <Target: Expression>
 begin
 	FetchSegmentRangeOf(Start, Finish, Target, output)
 	StoreSegmentRangeOf(input, Start, Finish, Target)
 end syntax
 
-syntax CountSegmentsOf is left unary operator with precedence 1
+syntax CountSegmentsOf is prefix operator with precedence 1
 	"the" "number" "of" "segments" "in" <Target: Expression>
 begin
 	EvalNumberOfSegmentsIn(Target, output)
 end syntax
 
-syntax AmongSegmentsOf is left unary operator with precedence 1
+syntax AmongSegmentsOf is left binary operator with precedence 1
 	<Needle: Expression> "is" "among" "the" "segments" "of" <Target: Expression>
 begin
 	EvalIsAmongTheSegmentsOf(Needle, Target, output)
 end syntax
 
-syntax NotAmongSegmentsOf is left unary operator with precedence 1
+syntax NotAmongSegmentsOf is left binary operator with precedence 1
 	<Needle: Expression> "is" "not" "among" "the" "segments" "of" <Target: Expression>
 begin
 	EvalIsNotAmongTheSegmentsOf(Needle, Target, output)
 end syntax
 
-syntax SegmentOffset is left unary operator with precedence 1
+syntax SegmentOffset is prefix operator with precedence 1
 	"the" "offset" "of" "segment" <Needle: Expression> "in" <Target: Expression>
 begin
 	EvalOffsetOfSegmentIn(Needle, Target, output)
