Add a ~mod* operator

This commit is contained in:
Nigel Tao committed 2019-11-12 21:30:45 +11:00
1 parent e1091ec182
commit cb7e9e0ce9
5 files changed
+35 -16

No files matched your search

+8 -6
View File
@@ -487,19 +487,16 @@ var cOpNames = [...]string{
t.IDPipeEq: " |= ",
t.IDHatEq: " ^= ",
t.IDPercentEq: " %= ",
t.IDTildeModShiftLEq: " <<= ",
t.IDTildeModPlusEq: " += ",
t.IDTildeModMinusEq: " -= ",
t.IDTildeModStarEq: " *= ",
t.IDTildeModShiftLEq: " <<= ",
t.IDTildeSatPlusEq: noSuchCOperator,
t.IDTildeSatMinusEq: noSuchCOperator,
t.IDEq: " = ",
t.IDEqQuestion: " = ",
t.IDXUnaryPlus: " + ",
t.IDXUnaryMinus: " - ",
t.IDXUnaryNot: " ! ",
t.IDXBinaryPlus: " + ",
t.IDXBinaryMinus: " - ",
t.IDXBinaryStar: " * ",
@@ -510,9 +507,10 @@ var cOpNames = [...]string{
t.IDXBinaryPipe: " | ",
t.IDXBinaryHat: " ^ ",
t.IDXBinaryPercent: " % ",
t.IDXBinaryTildeModShiftL: " << ",
t.IDXBinaryTildeModPlus: " + ",
t.IDXBinaryTildeModMinus: " - ",
t.IDXBinaryTildeModStar: " * ",
t.IDXBinaryTildeModShiftL: " << ",
t.IDXBinaryTildeSatPlus: noSuchCOperator,
t.IDXBinaryTildeSatMinus: noSuchCOperator,
t.IDXBinaryNotEq: " != ",
@@ -532,4 +530,8 @@ var cOpNames = [...]string{
t.IDXAssociativeHat: " ^ ",
t.IDXAssociativeAnd: " && ",
t.IDXAssociativeOr: " || ",
t.IDXUnaryPlus: " + ",
t.IDXUnaryMinus: " - ",
t.IDXUnaryNot: " ! ",
}
+6 -5
View File
@@ -149,10 +149,6 @@ func opString(x t.ID) string {
}
var opStrings = [...]string{
t.IDXUnaryPlus: "+",
t.IDXUnaryMinus: "-",
t.IDXUnaryNot: "not ",
t.IDXBinaryPlus: " + ",
t.IDXBinaryMinus: " - ",
t.IDXBinaryStar: " * ",
@@ -163,9 +159,10 @@ var opStrings = [...]string{
t.IDXBinaryPipe: " | ",
t.IDXBinaryHat: " ^ ",
t.IDXBinaryPercent: " % ",
t.IDXBinaryTildeModShiftL: " ~mod<< ",
t.IDXBinaryTildeModPlus: " ~mod+ ",
t.IDXBinaryTildeModMinus: " ~mod- ",
t.IDXBinaryTildeModStar: " ~mod* ",
t.IDXBinaryTildeModShiftL: " ~mod<< ",
t.IDXBinaryTildeSatPlus: " ~sat+ ",
t.IDXBinaryTildeSatMinus: " ~sat- ",
t.IDXBinaryNotEq: " <> ",
@@ -185,6 +182,10 @@ var opStrings = [...]string{
t.IDXAssociativeHat: " ^ ",
t.IDXAssociativeAnd: " and ",
t.IDXAssociativeOr: " or ",
t.IDXUnaryPlus: "+",
t.IDXUnaryMinus: "-",
t.IDXUnaryNot: "not ",
}
// Str returns a string form of n.
+1 -1
View File
@@ -1448,7 +1448,7 @@ func (q *checker) bcheckExprBinaryOp1(op t.ID, lhs *a.Expr, lb bounds, rhs *a.Ex
}, nil
}
case t.IDXBinaryTildeModPlus, t.IDXBinaryTildeModMinus:
case t.IDXBinaryTildeModPlus, t.IDXBinaryTildeModMinus, t.IDXBinaryTildeModStar:
typ := lhs.MType()
if typ.IsIdeal() {
typ = rhs.MType()
+10 -4
View File
@@ -283,7 +283,10 @@ func (q *checker) tcheckAssign(n *a.Assign) error {
n.Operator().Str(q.tm), rhs.Str(q.tm), rTyp.Str(q.tm))
}
return nil
case t.IDTildeModPlusEq, t.IDTildeModMinusEq, t.IDTildeSatPlusEq, t.IDTildeSatMinusEq:
case t.IDTildeModPlusEq, t.IDTildeModMinusEq, t.IDTildeModStarEq,
t.IDTildeSatPlusEq, t.IDTildeSatMinusEq:
if !lTyp.IsUnsignedInteger() {
return fmt.Errorf("check: assignment %q: %q, of type %q, does not have unsigned integer type",
n.Operator().Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm))
@@ -749,8 +752,9 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error {
}
switch op {
case t.IDXBinaryTildeModPlus, t.IDXBinaryTildeModMinus,
case t.IDXBinaryTildeModPlus, t.IDXBinaryTildeModMinus, t.IDXBinaryTildeModStar,
t.IDXBinaryTildeSatPlus, t.IDXBinaryTildeSatMinus:
typ := lTyp
if typ.IsIdeal() {
typ = rTyp
@@ -844,9 +848,11 @@ func evalConstValueBinaryOp(tm *t.Map, n *a.Expr, l *big.Int, r *big.Int) (*big.
return btoi((l.Sign() != 0) && (r.Sign() != 0)), nil
case t.IDXBinaryOr:
return btoi((l.Sign() != 0) || (r.Sign() != 0)), nil
case t.IDXBinaryTildeModShiftL,
t.IDXBinaryTildeModPlus, t.IDXBinaryTildeModMinus,
case t.IDXBinaryTildeModPlus, t.IDXBinaryTildeModMinus,
t.IDXBinaryTildeModStar, t.IDXBinaryTildeModShiftL,
t.IDXBinaryTildeSatPlus, t.IDXBinaryTildeSatMinus:
return nil, fmt.Errorf("check: cannot apply tilde-operators to ideal numbers")
}
return nil, fmt.Errorf("check: unrecognized token (0x%02X) for evalConstValueBinaryOp", n.Operator())
+10
View File
@@ -244,6 +244,7 @@ const (
IDTildeModPlusEq = ID(0x20)
IDTildeModMinusEq = ID(0x21)
IDTildeModStarEq = ID(0x22)
IDTildeModShiftLEq = ID(0x24)
IDTildeSatPlusEq = ID(0x28)
@@ -274,6 +275,7 @@ const (
IDTildeModPlus = ID(0x40)
IDTildeModMinus = ID(0x41)
IDTildeModStar = ID(0x42)
IDTildeModShiftL = ID(0x44)
IDTildeSatPlus = ID(0x48)
@@ -308,6 +310,7 @@ const (
IDXBinaryTildeModPlus = ID(0x70)
IDXBinaryTildeModMinus = ID(0x71)
IDXBinaryTildeModStar = ID(0x72)
IDXBinaryTildeModShiftL = ID(0x74)
IDXBinaryTildeSatPlus = ID(0x78)
@@ -642,6 +645,7 @@ var builtInsByID = [nBuiltInIDs]string{
IDTildeModPlusEq: "~mod+=",
IDTildeModMinusEq: "~mod-=",
IDTildeModStarEq: "~mod*=",
IDTildeModShiftLEq: "~mod<<=",
IDTildeSatPlusEq: "~sat+=",
@@ -663,6 +667,7 @@ var builtInsByID = [nBuiltInIDs]string{
IDTildeModPlus: "~mod+",
IDTildeModMinus: "~mod-",
IDTildeModStar: "~mod*",
IDTildeModShiftL: "~mod<<",
IDTildeSatPlus: "~sat+",
@@ -1044,6 +1049,8 @@ var lexers = [256][]suffixLexer{
{"mod+", IDTildeModPlus},
{"mod-=", IDTildeModMinusEq},
{"mod-", IDTildeModMinus},
{"mod*=", IDTildeModStarEq},
{"mod*", IDTildeModStar},
{"sat+=", IDTildeSatPlusEq},
{"sat+", IDTildeSatPlus},
{"sat-=", IDTildeSatMinusEq},
@@ -1064,6 +1071,7 @@ var ambiguousForms = [nBuiltInSymbolicIDs]ID{
IDXBinaryPercent: IDPercent,
IDXBinaryTildeModPlus: IDTildeModPlus,
IDXBinaryTildeModMinus: IDTildeModMinus,
IDXBinaryTildeModStar: IDTildeModStar,
IDXBinaryTildeModShiftL: IDTildeModShiftL,
IDXBinaryTildeSatPlus: IDTildeSatPlus,
IDXBinaryTildeSatMinus: IDTildeSatMinus,
@@ -1129,6 +1137,7 @@ var binaryForms = [nBuiltInSymbolicIDs]ID{
IDPercentEq: IDXBinaryPercent,
IDTildeModPlusEq: IDXBinaryTildeModPlus,
IDTildeModMinusEq: IDXBinaryTildeModMinus,
IDTildeModStarEq: IDXBinaryTildeModStar,
IDTildeModShiftLEq: IDXBinaryTildeModShiftL,
IDTildeSatPlusEq: IDXBinaryTildeSatPlus,
IDTildeSatMinusEq: IDXBinaryTildeSatMinus,
@@ -1145,6 +1154,7 @@ var binaryForms = [nBuiltInSymbolicIDs]ID{
IDPercent: IDXBinaryPercent,
IDTildeModPlus: IDXBinaryTildeModPlus,
IDTildeModMinus: IDXBinaryTildeModMinus,
IDTildeModStar: IDXBinaryTildeModStar,
IDTildeModShiftL: IDXBinaryTildeModShiftL,
IDTildeSatPlus: IDXBinaryTildeSatPlus,
IDTildeSatMinus: IDXBinaryTildeSatMinus,