BIG FORMATING COMMIT

This commit is contained in:
2023-07-30 15:55:22 +02:00
parent 088fce0aaa
commit 91972107eb
103 changed files with 1610 additions and 1585 deletions

View File

@@ -3,7 +3,6 @@ package lib.turtle;
// Check usage of NativeStringTools
// here https://api.haxe.org/lua/NativeStringTools.html
// and here http://lua-users.org/wiki/StringLibraryTutorial
import kernel.turtle.Types.TurtleSlot;
import kernel.turtle.Turtle;
import lua.NativeStringTools;
@@ -14,24 +13,21 @@ using tink.CoreApi;
Save a set of turtle instructions to a string and execute them.
**/
class TurtleInstructionParser {
public function new() {}
public function new() {
}
public function encode(instructions: Array<TurtleInstruction>): String {
public function encode(instructions:Array<TurtleInstruction>):String {
var s = "";
var times = 0;
var lastInstruction: TurtleInstruction = null;
var lastInstruction:TurtleInstruction = null;
for (inst in instructions){
if (inst == lastInstruction){
for (inst in instructions) {
if (inst == lastInstruction) {
times++;
continue;
}
if (lastInstruction != null){
if (lastInstruction != null) {
var encoded = encodeInstruction(lastInstruction);
s = s + '${times + 1}$encoded';
}
@@ -46,9 +42,9 @@ class TurtleInstructionParser {
return s;
}
private function encodeInstruction(inst: TurtleInstruction): String {
for (k => v in cmdMap){
if (v == inst){
private function encodeInstruction(inst:TurtleInstruction):String {
for (k => v in cmdMap) {
if (v == inst) {
return k;
}
}
@@ -63,15 +59,15 @@ class TurtleInstructionParser {
return "";
}
private function encodeSlot(slot: TurtleSlot): String {
private function encodeSlot(slot:TurtleSlot):String {
return String.fromCharCode(slot + 97);
}
public function parse(instructionsString: String): Array<TurtleInstruction> {
var rtn: Array<TurtleInstruction> = [];
var mfunc = NativeStringTools.gmatch(instructionsString,"%d+%D+");
public function parse(instructionsString:String):Array<TurtleInstruction> {
var rtn:Array<TurtleInstruction> = [];
var mfunc = NativeStringTools.gmatch(instructionsString, "%d+%D+");
while(true){
while (true) {
var found = mfunc();
if (found == null) {
@@ -82,7 +78,7 @@ class TurtleInstructionParser {
var command = NativeStringTools.match(found, "%D+");
var cmd = cmdMap.get(command);
if (cmd != null){
if (cmd != null) {
rtn = rtn.concat([for (i in 0...times) cmd]);
}
@@ -96,7 +92,7 @@ class TurtleInstructionParser {
return rtn;
}
private static function parseSlot(slot: String): TurtleSlot {
private static function parseSlot(slot:String):TurtleSlot {
var slot = slot.charCodeAt(0) - 97;
if (slot < 0 || slot > Turtle.MAX_SLOTS) {
@@ -107,19 +103,8 @@ class TurtleInstructionParser {
return slot;
}
private var cmdMap:Map<String,TurtleInstruction> = [
"a" => Forward,
"b" => Back,
"c" => TurnLeft,
"d" => TurnRight,
"e" => Up,
"f" => Down,
"g" => Dig(Front),
"h" => Dig(Up),
"i" => Dig(Down),
"j" => Place(Front),
"k" => Place(Up),
"l" => Place(Down),
private var cmdMap:Map<String, TurtleInstruction> = [
"a" => Forward, "b" => Back, "c" => TurnLeft, "d" => TurnRight, "e" => Up, "f" => Down, "g" => Dig(Front), "h" => Dig(Up), "i" => Dig(Down),
"j" => Place(Front), "k" => Place(Up), "l" => Place(Down),
];
}