add shiftleft, more of parse.c building

ast.myr

@@ -152,6 +152,7 @@ pkg qc =
 	type bop = union
 		`Oplus
 		`Ominus
+		`Oshl
 		`Omul
 		`Odiv
 		`Omod

cpp.myr

@@ -407,8 +407,8 @@ const evalshiftexpr = {expr
 	l = evaladdexpr(expr)
 	while true
 		match expr#[0].kind
-		| `Tbsl: f = {l, r; -> l << r}
-		| `Tbsr: f = {l, r; -> l >> r}
+		| `Tshl: f = {l, r; -> l << r}
+		| `Tshr: f = {l, r; -> l >> r}
 		| _:
 			break
 		;;

emit.myr

@@ -1103,6 +1103,7 @@ const emitbinop2 = {op, ty, lexpr, rexpr
 	| `Oxor:   o = "xor"
 	| `Oand:   o = "and"
 	| `Oor:    o = "or"
+	| `Oshl:   o = "shl"
 	;;
 
 	oi("{} ={} {} {}, {}\n", result, class, o, l, r)

fold.myr

@@ -34,13 +34,16 @@ const foldexpr = {e
 		;;
 	| &(`Ebinop [.op=op, .l=l, .r=r]):
 		match (op, foldexpr(l), foldexpr(r))
+		| (`Oplus, `std.Some `Constint c1,  `std.Some `Constint c2):
+			-> `std.Some `Constint c1 + c2
+		| (`Oshl, `std.Some `Constint c1,  `std.Some `Constint c2):
+			-> `std.Some `Constint c1 << c2
 		| (_, `std.None, _):
 			-> `std.None
 		| (_, _, `std.None):
 			-> `std.None
-		| (`Oplus, `std.Some `Constint c1,  `std.Some `Constint c2):
-			-> `std.Some `Constint c1 + c2
 		| _:
+			-> `std.None
 		;;
 	| _:
 		-> `std.None

parse.myr

@@ -1897,7 +1897,7 @@ const parseeqlexpr = {p
 const parserelexpr = {p
 	var l, r, op
 
-	l = parseaddexpr(p)
+	l = parseshiftexpr(p)
 	while true
 		match p.tok.kind
 		| `Tgt: op = `Ogt
@@ -1908,12 +1908,30 @@ const parserelexpr = {p
 			break
 		;;
 		next(p)
-		r = parseaddexpr(p)
+		r = parseshiftexpr(p)
 		l = mkrelop(op, l, r)
 	;;
 	-> l
 }
 
+const parseshiftexpr = {p
+	var l, r, op
+
+	l = parseaddexpr(p)
+	while true
+		match p.tok.kind
+		| `Tshl: op = `Oshl
+		// | `Tshr: op = `Osr
+		| _:
+			break
+		;;
+		next(p)
+		r = parseaddexpr(p)
+		l = mkbinop(op, l, r)
+	;;
+	-> l
+}
+
 const parseaddexpr = {p
 	var l, r, op
 

test/execute/0104-shl.c

@@ -0,0 +1,12 @@
+
+int
+main()
+{
+	int x;
+
+	x = 1;
+	if ((x << 1) != 2)
+		return 1;
+
+	return 0;
+}

tok.myr

@@ -48,16 +48,17 @@ pkg qc =
 		`Tboreq   /* |= */
 		`Tbxoreq  /* ^= */
 		`Tbandeq  /* &= */
-		`Tbsleq   /* <<= */
-		`Tbsreq   /* >>= */
+		`Tshleq   /* <<= */
+		`Tshreq   /* >>= */
 
 		`Tbor     /* | */
 		`Tbxor    /* ^ */
 		`Tband    /* & */
-		`Tbsl     /* << */
-		`Tbsr     /* >> */
 		`Tbnot    /* ~ */
 
+		`Tshl     /* << */
+		`Tshr     /* >> */
+
 		`Teq      /* == */
 		`Tgt      /* > */
 		`Tlt      /* < */
@@ -638,9 +639,9 @@ const oper = {ts
 			t = `Tle;
 		elif matchc(ts, '<')
 			if matchc(ts, '=')
-				t = `Tbsleq
+				t = `Tshleq
 			else
-				t = `Tbsl
+				t = `Tshl
 			;;
 		else
 			t = `Tlt;
@@ -650,9 +651,9 @@ const oper = {ts
 			t = `Tge
 		elif matchc(ts, '>')
 			if matchc(ts, '=')
-				t = `Tbsreq
+				t = `Tshreq
 			else
-				t = `Tbsr
+				t = `Tshr
 			;;
 		else
 			t = `Tgt;