Update to correct project structure

subsetpark · Jun 20, 2017 · cc1b1da · cc1b1da
1 parent a76b5aa
commit cc1b1da
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/src/ad.nim → ad.nim b/src/ad.nim → ad.nim
@@ -1,5 +1,5 @@
 import strutils, rdstdin, options, os
-import base, op, obj, stack
+import src.op, src.obj, src.stack
 
 const
   prompt = "> "
@@ -23,7 +23,7 @@ proc handleArgs(args: var seq[string]) =
     echo doc
     quit()
   if "-v" in args or "--version" in args:
-    echo "ad " & VERSION
+    echo "ad " & "0.6.4"
     quit()
 
 var mainStack: Stack = @[]

diff --git a/ad.nimble b/ad.nimble
@@ -1,12 +1,9 @@
-import src.base
 # Package
-version       = VERSION
+version       = "0.6.4"
 author        = "Z. D. Smith"
 description   = "A simple RPN calculator"
 license       = "MIT"
 bin           = @["ad"]
-srcDir        = "src"
-binDir        = "bin"
 skipExt       = @["nim"]
 
 # Deps

diff --git a/src/base.nim b/src/base.nim
diff --git a/tests/nim.cfg b/tests/nim.cfg
@@ -1 +1 @@
---path:"../src/"
+--path:".."
diff --git a/tests/test b/tests/test
diff --git a/tests/test.nim b/tests/test.nim
@@ -1,5 +1,5 @@
 import unittest, random, strutils, sequtils, options
-import "../src/stack", "../src/op", "../src/explain", "../src/obj"
+import src.stack, src.op, src.explain, src.obj
 
 proc ingestLine(stack: var Stack, s: string) =
   let tokens = s.split()