Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit a7a4343

Browse files
peter-bpeter-b
committed
[Bug 15435] Rename "constructor chunk" level to "constructor"
The "chunk" is unnecessary.
1 parent e1943f6 commit a7a4343

File tree

7 files changed

+42
-42
lines changed

7 files changed

+42
-42
lines changed

‎docs/specs/lcb-precedence.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Lower precedence numbers are more tightly-binding.
3232
| 3 | property | `the paint of this canvas` |
3333
| | subscript chunk | `char 2 of tString` |
3434
| | function chunk | `the length of tList` |
35-
| | constructor chunk | `rectangle tList` |
35+
| | constructor | `rectangle tList` |
3636
| 4 | conversion | `tString parsed as number` |
3737
| 5 | modifier | `-tNum`, `bitwise not` |
3838
| 6 | exponentiation | `^` |

‎engine/src/canvas.lcb‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Example:
9999
Tags: Canvas
100100
*/
101101

102-
syntax RectangleMake is prefix operator with constructor chunk precedence
102+
syntax RectangleMake is prefix operator with constructor precedence
103103
"rectangle" <mRect: Expression>
104104
begin
105105
MCCanvasRectangleMakeWithList(mRect, output)
@@ -423,7 +423,7 @@ Example:
423423
Tags: Canvas
424424
*/
425425

426-
syntax ColorMake is prefix operator with constructor chunk precedence
426+
syntax ColorMake is prefix operator with constructor precedence
427427
"color" <mColor: Expression>
428428
begin
429429
MCCanvasColorMakeWithList(mColor, output)
@@ -621,7 +621,7 @@ Example:
621621
Tags: Canvas
622622
*/
623623

624-
syntax TransformMakeScale is prefix operator with constructor chunk precedence
624+
syntax TransformMakeScale is prefix operator with constructor precedence
625625
"transform" "with" "scale" <mScale: Expression>
626626
begin
627627
MCCanvasTransformMakeScaleWithList(mScale, output)
@@ -642,7 +642,7 @@ Example:
642642
Tags: Canvas
643643
*/
644644

645-
syntax TransformMakeSkew is prefix operator with constructor chunk precedence
645+
syntax TransformMakeSkew is prefix operator with constructor precedence
646646
"transform" "with" "skew" <mSkew: Expression>
647647
begin
648648
MCCanvasTransformMakeSkewWithList(mSkew, output)
@@ -663,7 +663,7 @@ Example:
663663
Tags: Canvas
664664
*/
665665

666-
syntax TransformMakeRotation is prefix operator with constructor chunk precedence
666+
syntax TransformMakeRotation is prefix operator with constructor precedence
667667
"transform" "with" "rotation" "by" <mRotation: Expression>
668668
begin
669669
MCCanvasTransformMakeRotation(mRotation, output)
@@ -684,7 +684,7 @@ Example:
684684
Tags: Canvas
685685
*/
686686

687-
syntax TransformMakeTranslation is prefix operator with constructor chunk precedence
687+
syntax TransformMakeTranslation is prefix operator with constructor precedence
688688
"transform" "with" "translation" <mTranslation: Expression>
689689
begin
690690
MCCanvasTransformMakeTranslationWithList(mTranslation, output)
@@ -705,7 +705,7 @@ Example:
705705
Tags: Canvas
706706
*/
707707

708-
syntax TransformMakeWithMatrixAsList is prefix operator with constructor chunk precedence
708+
syntax TransformMakeWithMatrixAsList is prefix operator with constructor precedence
709709
"transform" "with" "matrix" <mMatrix: Expression>
710710
begin
711711
MCCanvasTransformMakeWithMatrixAsList(mMatrix, output)
@@ -1124,7 +1124,7 @@ Example:
11241124
Tags: Canvas
11251125
*/
11261126

1127-
syntax SolidPaintMake is prefix operator with constructor chunk precedence
1127+
syntax SolidPaintMake is prefix operator with constructor precedence
11281128
"solid" "paint" "with" <mColor: Expression>
11291129
begin
11301130
MCCanvasSolidPaintMakeWithColor(mColor, output)
@@ -1198,7 +1198,7 @@ Example:
11981198
Tags: Canvas
11991199
*/
12001200

1201-
syntax PatternMake is prefix operator with constructor chunk precedence
1201+
syntax PatternMake is prefix operator with constructor precedence
12021202
"pattern" "with" <mImage: Expression>
12031203
begin
12041204
MCCanvasPatternMakeWithImage(mImage, output)
@@ -1228,7 +1228,7 @@ Example:
12281228
Tags: Canvas
12291229
*/
12301230

1231-
syntax PatternMakeTransformed is prefix operator with constructor chunk precedence
1231+
syntax PatternMakeTransformed is prefix operator with constructor precedence
12321232
"pattern" "with" <mImage: Expression> "transformed" "by" <mTransform: Expression>
12331233
begin
12341234
MCCanvasPatternMakeWithTransformedImage(mImage, mTransform, output)
@@ -1254,7 +1254,7 @@ Example:
12541254
Tags: Canvas
12551255
*/
12561256

1257-
syntax PatternMakeScaledBy is prefix operator with constructor chunk precedence
1257+
syntax PatternMakeScaledBy is prefix operator with constructor precedence
12581258
"pattern" "with" <mImage: Expression> "scaled" "by" <mScale: Expression>
12591259
begin
12601260
MCCanvasPatternMakeWithImageScaledWithList(mImage, mScale, output)
@@ -1282,7 +1282,7 @@ Example:
12821282
Tags: Canvas
12831283
*/
12841284

1285-
syntax PatternMakeTranslatedBy is prefix operator with constructor chunk precedence
1285+
syntax PatternMakeTranslatedBy is prefix operator with constructor precedence
12861286
"pattern" "with" <mImage: Expression> "translated" "by" <mTranslation: Expression>
12871287
begin
12881288
MCCanvasPatternMakeWithImageTranslatedWithList(mImage, mTranslation, output)
@@ -1308,7 +1308,7 @@ Example:
13081308
Tags: Canvas
13091309
*/
13101310

1311-
syntax PatternMakeRotatedBy is prefix operator with constructor chunk precedence
1311+
syntax PatternMakeRotatedBy is prefix operator with constructor precedence
13121312
"pattern" "with" <mImage: Expression> "rotated" "by" <mRotation: Expression>
13131313
begin
13141314
MCCanvasPatternMakeWithRotatedImage(mImage, mRotation, output)
@@ -1542,7 +1542,7 @@ Example:
15421542
Tags: Canvas
15431543
*/
15441544

1545-
syntax GradientStopMake is prefix operator with constructor chunk precedence
1545+
syntax GradientStopMake is prefix operator with constructor precedence
15461546
"gradient" "stop" "at" <mOffset: Expression> "with" <mColor: Expression>
15471547
begin
15481548
MCCanvasGradientStopMake(mOffset, mColor, output)
@@ -1572,7 +1572,7 @@ Example:
15721572
Tags: Canvas
15731573
*/
15741574

1575-
syntax GradientMakeWithRamp is prefix operator with constructor chunk precedence
1575+
syntax GradientMakeWithRamp is prefix operator with constructor precedence
15761576
<mType: GradientType> "gradient" "with" "ramp" <mRamp: Expression>
15771577
begin
15781578
MCCanvasGradientMakeWithRamp(mType, mRamp, output)
@@ -2098,7 +2098,7 @@ Example:
20982098
Tags: Canvas
20992099
*/
21002100

2101-
syntax ImageMakeFromFile is prefix operator with constructor chunk precedence
2101+
syntax ImageMakeFromFile is prefix operator with constructor precedence
21022102
"image" "from" "file" <mPath: Expression>
21032103
begin
21042104
MCCanvasImageMakeWithPath(mPath, output)
@@ -2120,7 +2120,7 @@ Example:
21202120

21212121
Tags: Canvas
21222122
*/
2123-
syntax ImageMakeFromResourceFile is prefix operator with constructor chunk precedence
2123+
syntax ImageMakeFromResourceFile is prefix operator with constructor precedence
21242124
"image" "from" "resource" "file" <mResource: Expression>
21252125
begin
21262126
MCCanvasImageMakeWithResourceFile(mResource, output)
@@ -2145,7 +2145,7 @@ Example:
21452145

21462146
Tags: Canvas
21472147
*/
2148-
syntax ImageMakeFromData is prefix operator with constructor chunk precedence
2148+
syntax ImageMakeFromData is prefix operator with constructor precedence
21492149
"image" "from" "data" <mData: Expression>
21502150
begin
21512151
MCCanvasImageMakeWithData(mData, output)
@@ -2172,7 +2172,7 @@ Example:
21722172

21732173
Tags: Canvas
21742174
*/
2175-
syntax ImageMakeWithPixels is prefix operator with constructor chunk precedence
2175+
syntax ImageMakeWithPixels is prefix operator with constructor precedence
21762176
"image" "of" "size" <mSize: Expression> "with" "pixels" <mPixels: Expression>
21772177
begin
21782178
// MCCanvasImageMakeWithPixels(mSize[0], mSize[1], mPixels, output)
@@ -2363,7 +2363,7 @@ Example:
23632363

23642364
Tags: Canvas
23652365
*/
2366-
syntax PathMake is prefix operator with constructor chunk precedence
2366+
syntax PathMake is prefix operator with constructor precedence
23672367
"path" <mInstructions: Expression>
23682368
begin
23692369
MCCanvasPathMakeWithInstructionsAsString(mInstructions, output)
@@ -2412,13 +2412,13 @@ Example:
24122412

24132413
Tags: Canvas
24142414
*/
2415-
syntax PathMakeWithRoundedRectangleWithRadius is prefix operator with constructor chunk precedence
2415+
syntax PathMakeWithRoundedRectangleWithRadius is prefix operator with constructor precedence
24162416
"rounded" "rectangle" "path" "of" <mRect: Expression> "with" "radius" <mRadius: Expression>
24172417
begin
24182418
MCCanvasPathMakeWithRoundedRectangle(mRect, mRadius, output)
24192419
end syntax
24202420

2421-
syntax PathMakeWithRoundedRectangleWithRadii is prefix operator with constructor chunk precedence
2421+
syntax PathMakeWithRoundedRectangleWithRadii is prefix operator with constructor precedence
24222422
"rounded" "rectangle" "path" "of" <mRect: Expression> "with" "radii" <mRadii: Expression>
24232423
begin
24242424
MCCanvasPathMakeWithRoundedRectangleWithRadiiAsList(mRect, mRadii, output)
@@ -2440,7 +2440,7 @@ Example:
24402440

24412441
Tags: Canvas
24422442
*/
2443-
syntax PathMakeWithRectangle is prefix operator with constructor chunk precedence
2443+
syntax PathMakeWithRectangle is prefix operator with constructor precedence
24442444
"rectangle" "path" "of" <mRect: Expression>
24452445
begin
24462446
MCCanvasPathMakeWithRectangle(mRect, output)
@@ -2463,7 +2463,7 @@ Example:
24632463

24642464
Tags: Canvas
24652465
*/
2466-
syntax PathMakeWithCircle is prefix operator with constructor chunk precedence
2466+
syntax PathMakeWithCircle is prefix operator with constructor precedence
24672467
"circle" "path" "centered" "at" <mCenter: Expression> "with" "radius" <mRadius: Expression>
24682468
begin
24692469
MCCanvasPathMakeWithCircle(mCenter, mRadius, output)
@@ -2486,7 +2486,7 @@ Example:
24862486

24872487
Tags: Canvas
24882488
*/
2489-
syntax PathMakeWithEllipse is prefix operator with constructor chunk precedence
2489+
syntax PathMakeWithEllipse is prefix operator with constructor precedence
24902490
"ellipse" "path" "centered" "at" <mPoint: Expression> "with" "radii" <mRadii: Expression>
24912491
begin
24922492
MCCanvasPathMakeWithEllipseWithRadiiAsList(mPoint, mRadii, output)
@@ -2509,7 +2509,7 @@ Example:
25092509

25102510
Tags: Canvas
25112511
*/
2512-
syntax PathMakeWithLine is prefix operator with constructor chunk precedence
2512+
syntax PathMakeWithLine is prefix operator with constructor precedence
25132513
"line" "path" "from" <mFrom: Expression> "to" <mTo: Expression>
25142514
begin
25152515
MCCanvasPathMakeWithLine(mFrom, mTo, output)
@@ -2536,7 +2536,7 @@ Example:
25362536

25372537
Tags: Canvas
25382538
*/
2539-
syntax PathMakeWithPoints is prefix operator with constructor chunk precedence
2539+
syntax PathMakeWithPoints is prefix operator with constructor precedence
25402540
( "polygon" <mClosed=true> | "polyline" <mClosed=false> ) "path" "with" "points" <mPoints: Expression>
25412541
begin
25422542
MCCanvasPathMakeWithPoints(mClosed, mPoints, output)
@@ -2566,7 +2566,7 @@ Example:
25662566

25672567
Tags: Canvas
25682568
*/
2569-
syntax PathMakeWithArc is prefix operator with constructor chunk precedence
2569+
syntax PathMakeWithArc is prefix operator with constructor precedence
25702570
"arc" "path" "centered" "at" <mCenter: Expression> "with" [ "radius" <mRadius: Expression> | "radii" <mRadii: Expression> ] "from" <mStartAngle: Expression> "to" <mEndAngle: Expression>
25712571
begin
25722572
MCCanvasPathMakeWithArcWithRadius(mCenter, mRadius, mStartAngle, mEndAngle, output)
@@ -2597,7 +2597,7 @@ Example:
25972597

25982598
Tags: Canvas
25992599
*/
2600-
syntax PathMakeWithSector is prefix operator with constructor chunk precedence
2600+
syntax PathMakeWithSector is prefix operator with constructor precedence
26012601
"sector" "path" "centered" "at" <mCenter: Expression> "with" [ "radius" <mRadius: Expression> | "radii" <mRadii: Expression> ] "from" <mStartAngle: Expression> "to" <mEndAngle: Expression>
26022602
begin
26032603
MCCanvasPathMakeWithSectorWithRadius(mCenter, mRadius, mStartAngle, mEndAngle, output)
@@ -2628,7 +2628,7 @@ Example:
26282628

26292629
Tags: Canvas
26302630
*/
2631-
syntax PathMakeWithSegment is prefix operator with constructor chunk precedence
2631+
syntax PathMakeWithSegment is prefix operator with constructor precedence
26322632
"segment" "path" "centered" "at" <mCenter: Expression> "with" [ "radius" <mRadius: Expression> | "radii" <mRadii: Expression> ] "from" <mStartAngle: Expression> "to" <mEndAngle: Expression>
26332633
begin
26342634
MCCanvasPathMakeWithSegmentWithRadius(mCenter, mRadius, mStartAngle, mEndAngle, output)
@@ -3198,7 +3198,7 @@ Example:
31983198

31993199
Tags: Canvas
32003200
*/
3201-
syntax EffectMakeWithProperties is prefix operator with constructor chunk precedence
3201+
syntax EffectMakeWithProperties is prefix operator with constructor precedence
32023202
<mType: EffectType> "effect" "with" "properties" <mProperties: Expression>
32033203
begin
32043204
MCCanvasEffectMakeWithPropertyArray(mType, mProperties, output)
@@ -3531,7 +3531,7 @@ Example:
35313531

35323532
Tags: Canvas
35333533
*/
3534-
syntax FontMake is prefix operator with constructor chunk precedence
3534+
syntax FontMake is prefix operator with constructor precedence
35353535
"font" <mName: Expression>
35363536
begin
35373537
MCCanvasFontMake(mName, output)
@@ -3554,7 +3554,7 @@ Example:
35543554

35553555
Tags: Canvas
35563556
*/
3557-
syntax FontMakeWithSize is prefix operator with constructor chunk precedence
3557+
syntax FontMakeWithSize is prefix operator with constructor precedence
35583558
"font" <mName: Expression> <mBold=false> <mItalic=false> "at" "size" <mSize: Expression>
35593559
begin
35603560
MCCanvasFontMakeWithSize(mName, mBold, mItalic, mSize, output)
@@ -3599,7 +3599,7 @@ Example:
35993599

36003600
Tags: Canvas
36013601
*/
3602-
syntax FontMakeWithStyleAndSize is prefix operator with constructor chunk precedence
3602+
syntax FontMakeWithStyleAndSize is prefix operator with constructor precedence
36033603
"font" <mName: Expression> "with" ( "bold" <mBold=true> <mItalic=false> | "italic" <mBold=false> <mItalic=true> | "bold" "italic" <mBold=true> <mItalic=true> ) "style" "at" "size" <mSize: Expression>
36043604
begin
36053605
MCCanvasFontMakeWithStyle(mName, mBold, mItalic, output)
@@ -4845,7 +4845,7 @@ end syntax
48454845

48464846
//////////
48474847

4848-
syntax NewCanvasWithSize is prefix operator with constructor chunk precedence
4848+
syntax NewCanvasWithSize is prefix operator with constructor precedence
48494849
"a" "new" "canvas" "with" "size" <Size: Expression>
48504850
begin
48514851
MCCanvasNewCanvasWithSize(Size, output)

‎engine/src/widget.lcb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ Create a new widget object of the specified kind. The widget can then be placed
11061106
References: PlaceWidget (statement)
11071107
*/
11081108

1109-
syntax ANewWidget is prefix operator with constructor chunk precedence
1109+
syntax ANewWidget is prefix operator with constructor precedence
11101110
"a" "new" "widget" <mKind: Expression>
11111111
begin
11121112
MCWidgetEvalANewWidget(mKind, output)

‎libscript/src/byte.lcb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ random data.
437437
Tags: Binary, Random
438438

439439
*/
440-
syntax RandomBytes is postfix operator with constructor chunk precedence
440+
syntax RandomBytes is postfix operator with constructor precedence
441441
<Count : Expression> "random" "bytes"
442442
begin
443443
MCDataExecRandomBytes(Count, output)

‎toolchain/lc-compile/src/grammar.g‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@
618618
'rule' SyntaxPrecedence(-> functionchunk):
619619
"function chunk"
620620
621-
'rule' SyntaxPrecedence(-> constructorchunk):
622-
"constructor chunk"
621+
'rule' SyntaxPrecedence(-> constructor):
622+
"constructor"
623623
624624
'rule' SyntaxPrecedence(-> conversion):
625625
"conversion"

‎toolchain/lc-compile/src/syntax.g‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
'rule' MapSyntaxPrecedence(property -> 3)
283283
'rule' MapSyntaxPrecedence(subscriptchunk -> 3)
284284
'rule' MapSyntaxPrecedence(functionchunk -> 3)
285-
'rule' MapSyntaxPrecedence(constructorchunk -> 3)
285+
'rule' MapSyntaxPrecedence(constructor -> 3)
286286

287287
'rule' MapSyntaxPrecedence(conversion -> 4)
288288

‎toolchain/lc-compile/src/types.g‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
bitwisexor, -- 5 bitwise xor 1
351351
bitwiseor, -- 5 bitwise or 1
352352
functionchunk, -- the length of tList
353-
constructorchunk, -- rectangle tList
353+
constructor, -- rectangle tList
354354
comparison, -- <=, <, is, =
355355
classification, -- 5 is a number
356356
logicalnot, -- not tBoolean

0 commit comments

Comments
 (0)