Trim semicolon in instructions

coderick14 · coderick14 · commit 753cca768279 · 2017-04-29T16:23:15.000+05:30
diff --git a/Memory/InstructionMemory.go b/Memory/InstructionMemory.go
@@ -232,7 +232,7 @@ func (instructionMemory *InstructionMemory) ValidateAndExecuteInstruction() erro
 
 	} else {
 
-		err = errors.New("Invalid instruction type on line number " + string(instructionMemory.PC+1))
+		err = errors.New("Invalid instruction type in " + currentInstruction)
 
 	}
 
diff --git a/arm.go b/arm.go
@@ -56,7 +56,7 @@ func main() {
 			fmt.Println("Error while reading file : ", err)
 			return
 		}
-		line = strings.TrimSpace(line)
+		line = strings.TrimSpace(strings.TrimRight(line, ";"))
 		Memory.InstructionMem.Instructions = append(Memory.InstructionMem.Instructions, line)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ func (instructionMemory *InstructionMemory) ValidateAndExecuteInstruction() erro`
`232`	`232`
`233`	`233`	`} else {`
`234`	`234`
`235`		`- err = errors.New("Invalid instruction type on line number " + string(instructionMemory.PC+1))`
	`235`	`+ err = errors.New("Invalid instruction type in " + currentInstruction)`
`236`	`236`
`237`	`237`	`}`
`238`	`238`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func main() {`
`56`	`56`	`fmt.Println("Error while reading file : ", err)`
`57`	`57`	`return`
`58`	`58`	`}`
`59`		`- line = strings.TrimSpace(line)`
	`59`	`+ line = strings.TrimSpace(strings.TrimRight(line, ";"))`
`60`	`60`	`Memory.InstructionMem.Instructions = append(Memory.InstructionMem.Instructions, line)`
`61`	`61`	`}`
`62`	`62`