Skip to content

Commit 39a1824

Browse files
runrevmarkrunrevmark
committed
Merge branch 'modular' of https://github.com/runrev/livecode-widgets into modular
2 parents 6eea826 + 590a7fc commit 39a1824

File tree

18 files changed

+82
-64
lines changed

18 files changed

+82
-64
lines changed

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ all: revdb dbodbc dbsqlite dbmysql dbpostgresql
223223
all: server-revdb server-dbodbc server-dbsqlite server-dbmysql server-dbpostgresql
224224
all: development standalone installer server
225225
all: revpdfprinter revandroid
226-
all: lc-bootstrap-compile
227226
all: lc-test
228227

229228
bootstrap: lc-bootstrap-compile

‎engine/Makefile.kernel-standalone‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include ../rules/environment.linux.makefile
55

66
SOURCES= \
77
lextable.cpp mode_standalone.cpp
8+
MLC_LIST = libkernel-modules.list
89

910
KERNEL_DEFINES=\
1011
MODE_STANDALONE

‎engine/src/canvas.mlc‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Example:
8080
Tags: Canvas
8181
*/
8282

83-
syntax RectangleMake is prefix operator with precedence 4
83+
syntax RectangleMake is prefix operator with precedence 2
8484
"rectangle" <mRect: Expression>
8585
begin
8686
MCCanvasRectangleMakeWithList(mRect, output)
@@ -105,14 +105,14 @@ Example:
105105
Tags: Canvas
106106
*/
107107

108-
syntax RectanglePropertyLeft is prefix operator with precedence 4
108+
syntax RectanglePropertyLeft is prefix operator with precedence 2
109109
"the" "left" "of" <mRect:Expression>
110110
begin
111111
MCCanvasRectangleGetLeft(mRect, output)
112112
MCCanvasRectangleSetLeft(input, mRect)
113113
end syntax
114114

115-
syntax RectanglePropertyX is prefix operator with precedence 4
115+
syntax RectanglePropertyX is prefix operator with precedence 2
116116
"the" "x" "of" <mRect:Expression>
117117
begin
118118
MCCanvasRectangleGetLeft(mRect, output)
@@ -138,14 +138,14 @@ Example:
138138
Tags: Canvas
139139
*/
140140

141-
syntax RectanglePropertyTop is prefix operator with precedence 4
141+
syntax RectanglePropertyTop is prefix operator with precedence 2
142142
"the" "top" "of" <mRect:Expression>
143143
begin
144144
MCCanvasRectangleGetTop(mRect, output)
145145
MCCanvasRectangleSetTop(input, mRect)
146146
end syntax
147147

148-
syntax RectanglePropertyY is prefix operator with precedence 4
148+
syntax RectanglePropertyY is prefix operator with precedence 2
149149
"the" "y" "of" <mRect:Expression>
150150
begin
151151
MCCanvasRectangleGetTop(mRect, output)
@@ -171,7 +171,7 @@ Example:
171171
Tags: Canvas
172172
*/
173173

174-
syntax RectanglePropertyRight is prefix operator with precedence 4
174+
syntax RectanglePropertyRight is prefix operator with precedence 2
175175
"the" "right" "of" <mRect:Expression>
176176
begin
177177
MCCanvasRectangleGetRight(mRect, output)
@@ -197,7 +197,7 @@ Example:
197197
Tags: Canvas
198198
*/
199199

200-
syntax RectanglePropertyBottom is prefix operator with precedence 4
200+
syntax RectanglePropertyBottom is prefix operator with precedence 2
201201
"the" "bottom" "of" <mRect:Expression>
202202
begin
203203
MCCanvasRectangleGetBottom(mRect, output)
@@ -223,7 +223,7 @@ Example:
223223
Tags: Canvas
224224
*/
225225

226-
syntax RectanglePropertyWidth is prefix operator with precedence 4
226+
syntax RectanglePropertyWidth is prefix operator with precedence 2
227227
"the" "width" "of" <mRect:Expression>
228228
begin
229229
MCCanvasRectangleGetWidth(mRect, output)
@@ -249,7 +249,7 @@ Example:
249249
Tags: Canvas
250250
*/
251251

252-
syntax RectanglePropertyHeight is prefix operator with precedence 4
252+
syntax RectanglePropertyHeight is prefix operator with precedence 2
253253
"the" "height" "of" <mRect:Expression>
254254
begin
255255
MCCanvasRectangleGetHeight(mRect, output)
@@ -282,7 +282,7 @@ Example:
282282
Tags: Canvas
283283
*/
284284

285-
syntax PointMake is prefix operator with precedence 4
285+
syntax PointMake is prefix operator with precedence 2
286286
"point" <mPoint: Expression>
287287
begin
288288
MCCanvasPointMakeWithList(mPoint, output)
@@ -304,7 +304,7 @@ Example:
304304
Tags: Canvas
305305
*/
306306

307-
syntax PointPropertyX is prefix operator with precedence 4
307+
syntax PointPropertyX is prefix operator with precedence 2
308308
"the" "x" "of" <mPoint: Expression>
309309
begin
310310
MCCanvasPointGetX(mPoint, output)
@@ -327,7 +327,7 @@ Example:
327327
Tags: Canvas
328328
*/
329329

330-
syntax PointPropertyY is prefix operator with precedence 4
330+
syntax PointPropertyY is prefix operator with precedence 2
331331
"the" "y" "of" <mPoint: Expression>
332332
begin
333333
MCCanvasPointGetY(mPoint, output)
@@ -1451,13 +1451,13 @@ public foreign handler MCCanvasImageGetHeight(in pImage as Image, out rHeight as
14511451
public foreign handler MCCanvasImageGetPixels(in pImage as Image, out rPixels as data) as undefined binds to "<builtin>"
14521452
// TODO - add image frame index property?
14531453

1454-
syntax ImageWidthProperty is prefix operator with precedence 4
1454+
syntax ImageWidthProperty is prefix operator with precedence 2
14551455
"the" "width" "of" <mImage: Expression>
14561456
begin
14571457
MCCanvasImageGetWidth(mImage, output)
14581458
end syntax
14591459

1460-
syntax ImageHeightProperty is prefix operator with precedence 4
1460+
syntax ImageHeightProperty is prefix operator with precedence 2
14611461
"the" "height" "of" <mImage: Expression>
14621462
begin
14631463
MCCanvasImageGetHeight(mImage, output)
@@ -1864,12 +1864,12 @@ end syntax
18641864

18651865
// Operations
18661866

1867-
public foreign handler MCCanvasFontMeasureText(in pText as string, in pFont as Font) as Rectangle binds to "<builtin>"
1867+
public foreign handler MCCanvasFontMeasureText(in pText as string, in pFont as Font, out pRect as Rectangle) as undefined binds to "<builtin>"
18681868

1869-
syntax FontOperationMeasureText is statement
1870-
"measure" <mText: Expression> "with" <mFont: Expression>
1869+
syntax FontOperationMeasureText is prefix operator with precedence 4
1870+
"the" "bounds" "of" "text" <mText: Expression> "with" <mFont: Expression>
18711871
begin
1872-
MCCanvasFontMeasureText(mText, mFont)
1872+
MCCanvasFontMeasureText(mText, mFont, output)
18731873
end syntax
18741874

18751875
////////////////////////////////////////////////////////////////////////////////

‎engine/src/module-canvas.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4074,9 +4074,9 @@ MCCanvasRectangleRef MCCanvasFontMeasureTextWithTransform(MCStringRef p_text, MC
40744074
return t_rect;
40754075
}
40764076

4077-
MCCanvasRectangleRef MCCanvasFontMeasureText(MCStringRef p_text, MCCanvasFontRef p_font)
4077+
void MCCanvasFontMeasureText(MCStringRef p_text, MCCanvasFontRef p_font, MCCanvasRectangleRef& r_rect)
40784078
{
4079-
return MCCanvasFontMeasureTextWithTransform(p_text, p_font, MCGAffineTransformMakeIdentity());
4079+
r_rect = MCCanvasFontMeasureTextWithTransform(p_text, p_font, MCGAffineTransformMakeIdentity());
40804080
}
40814081

40824082
////////////////////////////////////////////////////////////////////////////////

‎engine/src/module-canvas.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ extern "C" MC_DLLEXPORT void MCCanvasFontGetSize(MCCanvasFontRef p_font, uintege
464464
extern "C" MC_DLLEXPORT void MCCanvasFontSetSize(uinteger_t p_size, MCCanvasFontRef &x_font);
465465

466466
// Operations
467-
extern "C" MC_DLLEXPORT MCCanvasRectangleRef MCCanvasFontMeasureText(MCStringRef p_text, MCCanvasFontRef p_font);
467+
extern "C" MC_DLLEXPORT void MCCanvasFontMeasureText(MCStringRef p_text, MCCanvasFontRef p_font, MCCanvasRectangleRef& r_rect);
468468

469469
//////////
470470

‎libscript/src/arithmetic.mlc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ Example:
229229
Tags: Math
230230
*/
231231

232-
syntax PlusOperator is left binary operator with precedence 2
232+
syntax PlusOperator is left binary operator with precedence 4
233233
<Left: Expression> "+" <Right: Expression>
234234
begin
235235
MCArithmeticEvalNumberPlusNumber(Left, Right, output)
@@ -249,7 +249,7 @@ Example:
249249
Tags: Math
250250
*/
251251

252-
syntax MinusOperator is left binary operator with precedence 2
252+
syntax MinusOperator is left binary operator with precedence 4
253253
<Left: Expression> "-" <Right: Expression>
254254
begin
255255
MCArithmeticEvalNumberMinusNumber(Left, Right, output)
@@ -270,7 +270,7 @@ Tags: Math
270270

271271
*/
272272

273-
syntax TimesOperator is left binary operator with precedence 1
273+
syntax TimesOperator is left binary operator with precedence 3
274274
<Left: Expression> "*" <Right: Expression>
275275
begin
276276
MCArithmeticEvalNumberTimesNumber(Left, Right, output)
@@ -290,7 +290,7 @@ Example:
290290
Tags: Math
291291
*/
292292

293-
syntax OverOperator is left binary operator with precedence 1
293+
syntax OverOperator is left binary operator with precedence 3
294294
<Left: Expression> "/" <Right: Expression>
295295
begin
296296
MCArithmeticEvalNumberOverNumber(Left, Right, output)
@@ -314,7 +314,7 @@ Returns the remainder on dividing <Left> by <Right>
314314

315315
*/
316316

317-
syntax ModOperator is neutral binary operator with precedence 4
317+
syntax ModOperator is neutral binary operator with precedence 3
318318
<Left: Expression> "mod" <Right: Expression>
319319
begin
320320
MCArithmeticEvalNumberModNumber(Left, Right, output)
@@ -342,7 +342,7 @@ successive values of x wrap y cycle through the sequence 1, 2, ..., y.
342342

343343
*/
344344

345-
syntax WrapOperator is neutral binary operator with precedence 4
345+
syntax WrapOperator is neutral binary operator with precedence 3
346346
<Left: Expression> "wrap" <Right: Expression>
347347
begin
348348
MCArithmeticEvalNumberWrapNumber(Left, Right, output)
@@ -358,7 +358,7 @@ Right: An expression that evaluates to a number.
358358
Returns: True if <Left> is greater than <Right>, and false otherwise.
359359
*/
360360

361-
syntax NumberIsGreaterThanNumber is neutral binary operator with precedence 3
361+
syntax NumberIsGreaterThanNumber is neutral binary operator with precedence 5
362362
<Left: Expression> ">" <Right: Expression>
363363
begin
364364
MCArithmeticEvalNumberIsGreaterThanNumber(Left, Right, output)
@@ -372,7 +372,7 @@ Right: An expression that evaluates to a number.
372372
Returns: True if <Left> is greater than or equal to <Right>, and false otherwise.
373373
*/
374374

375-
syntax NumberIsGreaterThanOrEqualToNumber is neutral binary operator with precedence 3
375+
syntax NumberIsGreaterThanOrEqualToNumber is neutral binary operator with precedence 5
376376
<Left: Expression> ">=" <Right: Expression>
377377
begin
378378
MCArithmeticEvalNumberIsGreaterThanOrEqualToNumber(Left, Right, output)
@@ -390,7 +390,7 @@ Description:
390390
Tags: Math
391391
*/
392392

393-
syntax NumberIsLessThanNumber is neutral binary operator with precedence 3
393+
syntax NumberIsLessThanNumber is neutral binary operator with precedence 5
394394
<Left: Expression> "<" <Right: Expression>
395395
begin
396396
MCArithmeticEvalNumberIsLessThanNumber(Left, Right, output)
@@ -409,7 +409,7 @@ Tags: Math
409409
*/
410410

411411

412-
syntax NumberIsLessThanOrEqualToNumber is neutral binary operator with precedence 3
412+
syntax NumberIsLessThanOrEqualToNumber is neutral binary operator with precedence 5
413413
<Left: Expression> "<=" <Right: Expression>
414414
begin
415415
MCArithmeticEvalNumberIsLessThanOrEqualToNumber(Left, Right, output)
@@ -429,7 +429,7 @@ Description:
429429
Tags: Math
430430
*/
431431

432-
syntax NumberIsEqualToNumber is neutral binary operator with precedence 4
432+
syntax NumberIsEqualToNumber is neutral binary operator with precedence 6
433433
<Left: Expression> "=" <Right: Expression>
434434
begin
435435
MCArithmeticEvalEqualToNumber(Left, Right, output)
@@ -450,7 +450,7 @@ References: NumberIsEqualToNumber (operator)
450450
Tags: Math
451451
*/
452452

453-
syntax NumberIsNumber is neutral binary operator with precedence 5
453+
syntax NumberIsNumber is neutral binary operator with precedence 7
454454
<Left: Expression> "is" <Right: Expression>
455455
begin
456456
MCArithmeticEvalEqualToNumber(Left, Right, output)
@@ -472,7 +472,7 @@ Tags: Math
472472
*/
473473

474474

475-
syntax NumberIsNotNumber is neutral binary operator with precedence 5
475+
syntax NumberIsNotNumber is neutral binary operator with precedence 7
476476
<Left: Expression> "is not" <Right: Expression>
477477
begin
478478
MCArithmeticEvalNotEqualToNumber(Left, Right, output)

‎libscript/src/binary.mlc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Performs a byte by byte comparison of <Left> and <Right>, returning false if the
9595
Tags: Binary
9696
*/
9797

98-
syntax DataIsData is neutral binary operator with precedence 5
98+
syntax DataIsData is neutral binary operator with precedence 7
9999
<Left: Expression> "is" <Right: Expression>
100100
begin
101101
MCBinaryEvalIsEqualTo(Left, Right, output)
@@ -115,7 +115,7 @@ Performs a byte by byte comparison of <Left> and <Right>, returning true if ther
115115
Tags: Binary
116116
*/
117117

118-
syntax DataIsNotData is neutral binary operator with precedence 5
118+
syntax DataIsNotData is neutral binary operator with precedence 7
119119
<Left: Expression> "is not" <Right: Expression>
120120
begin
121121
MCBinaryEvalIsNotEqualTo(Left, Right, output)
@@ -136,7 +136,7 @@ Description:
136136
Tags: Binary
137137
*/
138138

139-
syntax DataIsLessThanData is neutral binary operator with precedence 3
139+
syntax DataIsLessThanData is neutral binary operator with precedence 5
140140
<Left: Expression> "<" <Right: Expression>
141141
begin
142142
MCBinaryEvalIsLessThan(Left, Right, output)
@@ -157,7 +157,7 @@ Description:
157157
Tags: Binary
158158
*/
159159

160-
syntax DataIsGreaterThanData is neutral binary operator with precedence 3
160+
syntax DataIsGreaterThanData is neutral binary operator with precedence 5
161161
<Left: Expression> ">" <Right: Expression>
162162
begin
163163
MCBinaryEvalIsGreaterThan(Left, Right, output)

‎libscript/src/list.mlc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ In particular, this means that comparison between string elements is case sensit
350350
Tags: Lists
351351
*/
352352

353-
syntax ListIsList is neutral binary operator with precedence 5
353+
syntax ListIsList is neutral binary operator with precedence 7
354354
<Left: Expression> "is" <Right: Expression>
355355
begin
356356
MCListEvalIsEqualTo(Left, Right, output)
@@ -379,7 +379,7 @@ In particular, this means that comparison between string elements is case sensit
379379
Tags: Lists
380380
*/
381381

382-
syntax ListIsNotList is neutral binary operator with precedence 5
382+
syntax ListIsNotList is neutral binary operator with precedence 7
383383
<Left: Expression> "is not" <Right: Expression>
384384
begin
385385
MCListEvalIsNotEqualTo(Left, Right, output)

‎libscript/src/logic.mlc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Tags: Logic
6565

6666
*/
6767

68-
syntax LogicNot is prefix operator with precedence 3
68+
syntax LogicNot is prefix operator with precedence 6
6969
"not" <Operand: Expression>
7070
begin
7171
MCLogicEvalNot(Operand, output)
@@ -89,7 +89,7 @@ Example:
8989
Tags: Logic
9090
*/
9191

92-
syntax BooleanIsEqualToBoolean is neutral binary operator with precedence 5
92+
syntax BooleanIsEqualToBoolean is neutral binary operator with precedence 7
9393
<Left: Expression> "is" <Right: Expression>
9494
begin
9595
MCLogicEvalIsEqualTo(Left, Right, output)
@@ -111,7 +111,7 @@ Example:
111111
Tags: Logic
112112
*/
113113

114-
syntax BooleanIsNotEqualToBoolean is neutral binary operator with precedence 5
114+
syntax BooleanIsNotEqualToBoolean is neutral binary operator with precedence 7
115115
<Left: Expression> "is not" <Right: Expression>
116116
begin
117117
MCLogicEvalIsNotEqualTo(Left, Right, output)

0 commit comments

Comments
 (0)