Implemented xor, or, and and.

Just emitting the correct tokens is enough to complete our math
operations.

TODO

@@ -1,4 +1,4 @@
-* [ ] Implement math operations: mod, pow, and, or
+* [x] Implement math operations: `and`, `or`, `xor`
 * [x] Implement string concat.
 * [x] Implement system.
 * [x] Implement peek/poke.

compiler/compiler.go

@@ -199,6 +199,9 @@ func (p *Compiler) Compile() {
  case token.ADD:
  p.mathOperation(opcode.ADD_OP)
 
+ case token.XOR:
+ p.mathOperation(opcode.XOR_OP)
+
  case token.SUB:
  p.mathOperation(opcode.SUB_OP)
 
@@ -208,6 +211,12 @@ func (p *Compiler) Compile() {
  case token.DIV:
  p.mathOperation(opcode.DIV_OP)
 
+ case token.AND:
+ p.mathOperation(opcode.AND_OP)
+
+ case token.OR:
+ p.mathOperation(opcode.OR_OP)
+
  default:
  fmt.Println("Unhandled token: ", p.curToken)
 

examples/math.in

@@ -0,0 +1,39 @@
+
+ store #1, "255 & 16 is : "
+ print_str #1
+
+ store #1, 255
+ store #2, 16
+ and #0, #1, #2
+ print_int #0
+ store #1, "\n"
+ print_str #1
+
+ cmp #0, 16
+ jmpz and_ok
+
+ store #1, "Result is WRONG!\n"
+ print_str #1
+ exit
+
+:and_ok
+
+ store #1, "32 XOR 23 is : "
+ print_str #1
+
+ # 32 XOR 23 => 55
+ store #1, 32
+ store #2, 23
+ xor #0, #1, #2
+ print_int #0
+ store #1, "\n"
+ print_str #1
+
+ cmp #0, 55
+ jmpz xor_ok
+
+ store #1, "Result is WRONG!\n"
+ print_str #1
+ exit
+
+:xor_ok

token/token.go

@@ -21,11 +21,14 @@ const (
 
  // math
  ADD = "ADD"
- SUB = "SUB"
- MUL = "MUL"
+ AND = "AND"
+ DEC = "DEC"
  DIV = "DIV"
  INC = "INC"
- DEC = "DEC"
+ MUL = "MUL"
+ OR = "OR"
+ SUB = "SUB"
+ XOR = "XOR"
 
  // control-flow
  CALL = "CALL"
@@ -91,11 +94,14 @@ var keywords = map[string]TokenType{
 
  // math
  "add": ADD,
- "sub": SUB,
- "mul": MUL,
+ "and": AND,
+ "dec": DEC,
  "div": DIV,
  "inc": INC,
- "dec": DEC,
+ "mul": MUL,
+ "or": OR,
+ "sub": SUB,
+ "xor": XOR,
 
  // control-flow
  "call": CALL,