Skip to content

Commit a79c7a2

Browse files
committed
add missing operators and fix precedences
1 parent b00c569 commit a79c7a2

File tree

1 file changed

+44
-39
lines changed

1 file changed

+44
-39
lines changed

src/components/operators.jl

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -500,13 +500,13 @@ const AllPrecs = Dict(
500500
"" => ArrowOp,
501501
"<:" => ComparisonOp,
502502
"" => ComparisonOp,
503-
"" => 0,
503+
"" => ArrowOp,
504504
"" => ComparisonOp,
505505
"" => ComparisonOp,
506506
"" => ComparisonOp,
507507
"" => ComparisonOp,
508-
"" => 0,
509-
"" => 0,
508+
"" => ArrowOp,
509+
"" => ArrowOp,
510510
"" => ComparisonOp,
511511
"" => ComparisonOp,
512512
"//" => RationalOp,
@@ -528,23 +528,24 @@ const AllPrecs = Dict(
528528
"" => ComparisonOp,
529529
"" => TimesOp,
530530
"" => ArrowOp,
531-
"" => 0,
531+
"" => ArrowOp,
532532
"" => TimesOp,
533533
"" => ComparisonOp,
534534
"" => ComparisonOp,
535535
"" => ArrowOp,
536536
"" => PowerOp,
537537
"" => PlusOp,
538538
"" => ComparisonOp,
539-
"" => 0,
539+
"" => ArrowOp,
540540
"" => ArrowOp,
541541
"" => ComparisonOp,
542542
"" => ComparisonOp,
543-
"" => 0,
543+
"" => TimesOp,
544544
"" => ComparisonOp,
545545
"" => ArrowOp,
546546
"" => PlusOp,
547547
"-" => PlusOp,
548+
"" => PlusOp,
548549
"" => ComparisonOp,
549550
"" => PowerOp,
550551
"+=" => AssignmentOp,
@@ -584,17 +585,17 @@ const AllPrecs = Dict(
584585
"" => ComparisonOp,
585586
"" => ComparisonOp,
586587
"" => PlusOp,
587-
"" => 0,
588+
"" => ArrowOp,
588589
"" => ArrowOp,
589590
"" => ComparisonOp,
590-
"" => 0,
591+
"" => ArrowOp,
591592
"" => ComparisonOp,
592593
"" => PlusOp,
593594
"" => ComparisonOp,
594595
"" => ComparisonOp,
595596
"" => TimesOp,
596597
"" => ComparisonOp,
597-
"" => 0,
598+
"" => ArrowOp,
598599
"" => ArrowOp,
599600
"" => ComparisonOp,
600601
"" => TimesOp,
@@ -637,7 +638,7 @@ const AllPrecs = Dict(
637638
"" => ArrowOp,
638639
"" => ComparisonOp,
639640
"" => ComparisonOp,
640-
"" => 0,
641+
"" => ArrowOp,
641642
"&" => TimesOp,
642643
"" => ComparisonOp,
643644
"" => ArrowOp,
@@ -650,7 +651,7 @@ const AllPrecs = Dict(
650651
"" => ComparisonOp,
651652
"=" => AssignmentOp,
652653
"" => TimesOp,
653-
"" => 0,
654+
"" => ArrowOp,
654655
"" => ComparisonOp,
655656
"" => ArrowOp,
656657
"" => ComparisonOp,
@@ -666,11 +667,11 @@ const AllPrecs = Dict(
666667
"" => ArrowOp,
667668
"" => PlusOp,
668669
"" => TimesOp,
669-
"" => 0,
670+
"" => ArrowOp,
670671
"" => ComparisonOp,
671672
"" => ColonOp,
672673
"" => ComparisonOp,
673-
"" => 0,
674+
"" => ArrowOp,
674675
"" => ComparisonOp,
675676
"" => PlusOp,
676677
"" => ArrowOp,
@@ -710,7 +711,7 @@ const AllPrecs = Dict(
710711
"" => ComparisonOp,
711712
"" => ComparisonOp,
712713
"" => ComparisonOp,
713-
"" => 0,
714+
"" => ArrowOp,
714715
"" => ArrowOp,
715716
"" => ArrowOp,
716717
"" => PlusOp,
@@ -733,7 +734,7 @@ const AllPrecs = Dict(
733734
"//=" => AssignmentOp,
734735
"" => ComparisonOp,
735736
"" => ComparisonOp,
736-
"" => 0,
737+
"" => ArrowOp,
737738
"" => TimesOp,
738739
"" => ComparisonOp,
739740
"" => ComparisonOp,
@@ -782,14 +783,14 @@ const AllPrecs = Dict(
782783
"" => TimesOp,
783784
"" => ArrowOp,
784785
"" => PowerOp,
785-
"" => ComparisonOp,
786+
"" => AssignmentOp,
786787
"" => ArrowOp,
787788
"" => TimesOp,
788789
"" => PlusOp,
789790
"" => ArrowOp,
790-
"" => 0,
791+
"" => ArrowOp,
791792
"<<=" => AssignmentOp,
792-
"" => ComparisonOp,
793+
"" => AssignmentOp,
793794
"" => TimesOp,
794795
"" => ComparisonOp,
795796
"" => ComparisonOp,
@@ -814,7 +815,7 @@ const AllPrecs = Dict(
814815
"" => ComparisonOp,
815816
"" => ArrowOp,
816817
"" => ComparisonOp,
817-
"" => 0,
818+
"" => ArrowOp,
818819
"" => TimesOp,
819820
"" => ComparisonOp,
820821
"" => TimesOp,
@@ -829,13 +830,12 @@ const AllPrecs = Dict(
829830
"" => ComparisonOp,
830831
"" => ComparisonOp,
831832
"" => ArrowOp,
832-
"|++|" => PlusOp,
833-
"" => 0,
833+
"" => ArrowOp,
834834
"" => ArrowOp,
835835
"" => PlusOp,
836836
"" => TimesOp,
837837
"" => PowerOp,
838-
"" => 0,
838+
"" => ArrowOp,
839839
"" => ComparisonOp,
840840
"" => ArrowOp,
841841
"" => TimesOp,
@@ -851,7 +851,7 @@ const AllPrecs = Dict(
851851
"" => PowerOp,
852852
"" => ComparisonOp,
853853
"" => ComparisonOp,
854-
"" => ComparisonOp,
854+
"" => AssignmentOp,
855855
"" => ArrowOp,
856856
"" => ArrowOp,
857857
">>>" => BitShiftOp,
@@ -905,15 +905,15 @@ const AllPrecs = Dict(
905905
"" => ComparisonOp,
906906
"" => PlusOp,
907907
"" => ArrowOp,
908-
"" => 0,
908+
"" => ArrowOp,
909909
"" => TimesOp,
910910
"in" => ComparisonOp,
911911
"==" => ComparisonOp,
912912
"" => ArrowOp,
913913
"" => ArrowOp,
914914
":=" => AssignmentOp,
915915
"" => ComparisonOp,
916-
"" => PlusOp,
916+
"" => ComparisonOp,
917917
"<|" => PipeOp,
918918
"" => ArrowOp,
919919
"" => ComparisonOp,
@@ -926,14 +926,15 @@ const AllPrecs = Dict(
926926
"" => TimesOp,
927927
"" => ArrowOp,
928928
".." => ColonOp,
929-
"" => 0,
929+
"" => ArrowOp,
930930
"⪿" => ComparisonOp,
931931
"" => ComparisonOp,
932932
"" => ColonOp,
933933
"" => ArrowOp,
934934
"" => ArrowOp,
935935
"" => PowerOp,
936936
"-=" => AssignmentOp,
937+
"−=" => AssignmentOp,
937938
"<" => ComparisonOp,
938939
"" => ComparisonOp,
939940
"" => ArrowOp,
@@ -953,7 +954,7 @@ const AllPrecs = Dict(
953954
"" => ComparisonOp,
954955
"" => PlusOp,
955956
"" => ComparisonOp,
956-
"" => 0,
957+
"" => ArrowOp,
957958
"" => TimesOp,
958959
"" => ComparisonOp,
959960
"" => ArrowOp,
@@ -966,7 +967,7 @@ const AllPrecs = Dict(
966967
"" => ComparisonOp,
967968
"" => TimesOp,
968969
"" => ComparisonOp,
969-
"" => 0,
970+
"" => ArrowOp,
970971
"" => ComparisonOp,
971972
"" => ComparisonOp,
972973
"" => ArrowOp,
@@ -975,7 +976,7 @@ const AllPrecs = Dict(
975976
"<<" => BitShiftOp,
976977
"" => ComparisonOp,
977978
"" => TimesOp,
978-
"" => 0,
979+
"" => ArrowOp,
979980
"" => TimesOp,
980981
"" => ComparisonOp,
981982
"" => ComparisonOp,
@@ -1001,8 +1002,7 @@ const AllPrecs = Dict(
10011002
"" => ComparisonOp,
10021003
"&=" => AssignmentOp,
10031004
"" => ComparisonOp,
1004-
"\\\\=" => TimesOp,
1005-
"" => 0,
1005+
"" => ArrowOp,
10061006
"" => ArrowOp,
10071007
"" => TimesOp,
10081008
"" => ComparisonOp,
@@ -1052,6 +1052,7 @@ const AllPrecs = Dict(
10521052
"" => ComparisonOp,
10531053
"" => ComparisonOp,
10541054
"" => TimesOp,
1055+
"·" => TimesOp,
10551056
"" => TimesOp,
10561057
"" => PowerOp,
10571058
"" => PlusOp,
@@ -1097,11 +1098,11 @@ const AllPrecs = Dict(
10971098
"" => ArrowOp,
10981099
"" => ArrowOp,
10991100
"" => ComparisonOp,
1100-
"" => 0,
1101+
"" => ArrowOp,
11011102
"" => ArrowOp,
11021103
"" => ComparisonOp,
1103-
"" => 0,
1104-
"" => 0,
1104+
"" => ArrowOp,
1105+
"" => ArrowOp,
11051106
"" => TimesOp,
11061107
"&&" => LazyAndOp,
11071108
"" => TimesOp,
@@ -1111,12 +1112,12 @@ const AllPrecs = Dict(
11111112
"" => ArrowOp,
11121113
"" => ComparisonOp,
11131114
"" => ArrowOp,
1114-
"" => 0,
1115+
"" => ArrowOp,
11151116
":" => ColonOp,
1116-
"" => 0,
1117+
"" => ArrowOp,
11171118
"" => ComparisonOp,
11181119
"" => ArrowOp,
1119-
"" => 0,
1120+
"" => ArrowOp,
11201121
"" => ComparisonOp,
11211122
"" => ArrowOp,
11221123
"" => ComparisonOp,
@@ -1127,7 +1128,7 @@ const AllPrecs = Dict(
11271128
"" => ComparisonOp,
11281129
"" => TimesOp,
11291130
"" => TimesOp,
1130-
"" => 0,
1131+
"" => ArrowOp,
11311132
"" => ComparisonOp,
11321133
"" => ComparisonOp,
11331134
"|" => PlusOp,
@@ -1148,5 +1149,9 @@ const AllPrecs = Dict(
11481149
"" => 0,
11491150
"" => 0,
11501151
"++" => PlusOp,
1151-
"¬" => 0
1152+
"¬" => 0,
1153+
"¦" => PlusOp,
1154+
"" => TimesOp,
1155+
"" => ComparisonOp,
1156+
"" => ComparisonOp
11521157
)

0 commit comments

Comments
 (0)