8 files changed, 16 insertions(+), 15 deletions(-)
M 06/hack-assembler/pom.xml
R 06/hack-assembler/src/main/{hackassembler/Main.kt => Main.kt}
R 06/hack-assembler/src/main/{hackassembler/Commands.kt => assembler/Commands.kt}
R 06/hack-assembler/src/main/{hackassembler/Parser.kt => assembler/Parser.kt}
R 06/hack-assembler/src/main/{hackassembler/translation/BinaryCodes.kt => assembler/translation/BinaryCodes.kt}
R 06/hack-assembler/src/main/{hackassembler/translation/DefaultSymbolTable.kt => assembler/translation/DefaultSymbolTable.kt}
R 06/hack-assembler/src/test/{hackassembler/CommandsTest.kt => assembler/CommandsTest.kt}
R 06/hack-assembler/src/test/{hackassembler/ParserTest.kt => assembler/ParserTest.kt}
M 06/hack-assembler/pom.xml => 06/hack-assembler/pom.xml +1 -1
@@ 8,7 8,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>com.macaptain hack-hackassembler</name>
+ <name>com.macaptain hack-assembler</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
R 06/hack-assembler/src/main/hackassembler/Main.kt => 06/hack-assembler/src/main/Main.kt +1 -2
@@ 1,5 1,4 @@
-package hackassembler
-
+import assembler.Parser
import org.apache.commons.io.FilenameUtils
import java.io.BufferedReader
import java.io.File
R 06/hack-assembler/src/main/hackassembler/Commands.kt => 06/hack-assembler/src/main/assembler/Commands.kt +5 -5
@@ 1,9 1,9 @@
-package hackassembler
+package assembler
-import hackassembler.translation.compMap
-import hackassembler.translation.destMap
-import hackassembler.translation.jumpMap
-import hackassembler.translation.toZeroPaddedBinary
+import assembler.translation.compMap
+import assembler.translation.destMap
+import assembler.translation.jumpMap
+import assembler.translation.toZeroPaddedBinary
import java.util.*
interface Command {
R 06/hack-assembler/src/main/hackassembler/Parser.kt => 06/hack-assembler/src/main/assembler/Parser.kt +5 -3
@@ 1,7 1,9 @@
-package hackassembler
+package assembler
-import hackassembler.translation.MAX_MEMORY
-import hackassembler.translation.defaultSymbolTable
+import assembler.translation.MAX_MEMORY
+import assembler.translation.defaultSymbolTable
+import assembler.translation.MAX_MEMORY
+import assembler.translation.defaultSymbolTable
import java.io.BufferedReader
import java.util.*
R 06/hack-assembler/src/main/hackassembler/translation/BinaryCodes.kt => 06/hack-assembler/src/main/assembler/translation/BinaryCodes.kt +1 -1
@@ 1,4 1,4 @@
-package hackassembler.translation
+package assembler.translation
/**
* Returns a string of the integer converted to binary, left padded with 0 to be of length @length
R 06/hack-assembler/src/main/hackassembler/translation/DefaultSymbolTable.kt => 06/hack-assembler/src/main/assembler/translation/DefaultSymbolTable.kt +1 -1
@@ 1,4 1,4 @@
-package hackassembler.translation
+package assembler.translation
const val MAX_MEMORY = 24576
R 06/hack-assembler/src/test/hackassembler/CommandsTest.kt => 06/hack-assembler/src/test/assembler/CommandsTest.kt +1 -1
@@ 1,4 1,4 @@
-package hackassembler
+package assembler
import org.junit.Test
import kotlin.test.assertEquals
R 06/hack-assembler/src/test/hackassembler/ParserTest.kt => 06/hack-assembler/src/test/assembler/ParserTest.kt +1 -1
@@ 1,4 1,4 @@
-package hackassembler
+package assembler
import org.junit.Test
import java.io.BufferedReader