Merge pull request #21 from Clonkk/devel_051

Devel 051

Author: Clonkk

.gitignore

@@ -2,15 +2,13 @@
 bin/
 testfull
 testleak
-teststacktrace
+indexingtests
+legacy
 
 testresults/
 nimcache/
 
 install/
 third_party/
 
-sugar_example
-sugar_example.nim
-
 memgraph.png

changelog.md

@@ -1,6 +1,14 @@
 Changelog for Nimjl. Date in format YYYY_MM_DD
 
-Release v0.5.0 - 2021_05_XX
+Release v0.5.1 - 2021_05_21
+===========================
+* Added some operators
+* Added support for iterators
+* Added toJlValue as an alias to toJlVal for consistency
+* Added indexing syntax
+* Added swapMemoryOrder for col major vs row major
+
+Release v0.5.0 - 2021_05_19
 ===========================
 * Add Nim interop syntax
 * Started work on indexing Julia Arrays natively

nimjl.nim

@@ -1,35 +1,27 @@
 import nimjl/arrays
 export arrays
 
-import nimjl/coretypes
-export coretypes
+import nimjl/cores
+export cores
 
-import nimjl/boxunbox
-export boxunbox
-
-import nimjl/config
-# export config
-
-import nimjl/converttypes
-export converttypes
-
-import nimjl/dicttuples
-export dicttuples
+import nimjl/types
+export types
 
 import nimjl/gc
 export gc
 
-import nimjl/modfuncs
-export modfuncs
+import nimjl/functions
+export functions
+
+import nimjl/glucose
+export glucose
 
-import nimjl/interop
-export interop
+import nimjl/sugar/converttypes
+export converttypes
 
-# Uncomment for debugging
-# once:
-#   echo "Nimjl> Using Julia install: ", JuliaPath
-# static:
-# echo "JuliaIncludesPath> ", JuliaIncludesPath
-# echo "JuliaLibPath> ", JuliaLibPath
-# echo "JuliaLibName> ", JuliaLibName
+import nimjl/sugar/valindexing
+export valindexing
 
+import nimjl/config
+static:
+  debugEcho "Nimjl> Using Julia install: ", JuliaPath

nimjl.nimble

@@ -1,6 +1,6 @@
 # Nimjl
 # Licensed and distributed under MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
-version       = "0.5.0"
+version       = "0.5.1"
 author        = "Regis Caillaud"
 description   = "Nim Julia bridge"
 license       = "MIT"

nimjl/arrays.nim

@@ -1,14 +1,13 @@
-import ./coretypes
+import ./types
 import ./private/jlcores
 import ./private/jlarrays
-import ./modfuncs
+import ./functions
 
 import arraymancer
 
 import std/typetraits
 import std/sequtils
 
-
 proc toJlArray*[T](x: JlValue): JlArray[T] {.inline.} =
   result = cast[ptr jl_array](x)
 
@@ -61,5 +60,9 @@ proc allocJlArray*(dims: openArray[int], T: typedesc): JlValue =
   ## Create a Julia Array managed by Julia GC
   result = cast[JlValue](julia_alloc_array(dims, T))
 
-# import arrays/indexing
-# export indexing
+import ./arrays/interop
+export interop
+
+import ./arrays/indexing
+export indexing
+