Add dependencies on alphabetical order

Also, headers are included first and later the modules.

bindgen/generators/nelua.tl

@@ -5,6 +5,7 @@ Please refer to the LICENSE file for details
 SPDX-License-Identifier: Zlib
 ]]
 
+local utils = require 'bindgen.utils'
 local Node = require 'bindgen.node'
 local Generator = require 'bindgen.generator'
 local Dependencies = require 'bindgen.dependencies'
@@ -114,8 +115,22 @@ function NeluaGenerator:dependencies(dependencies: Dependencies, wrap_options: G
    end
 
    -- generate required modules or headers
-   for dep_name, dep in pairs(dependencies.dependencies) do
-      table.insert(result, self:dependency(dep_name, dep, wrap_options))
+   local dep_names, _ = utils.kpairs_to_alphabetic_ipairs(dependencies.dependencies)
+
+   -- generate required headers
+   for _, dep_name in ipairs(dep_names) do
+      local dep = dependencies.dependencies[dep_name]
+      if dep.is_header then
+         table.insert(result, self:dependency(dep_name, dep, wrap_options))
+      end
+   end
+
+   -- generate required modules
+   for _, dep_name in ipairs(dep_names) do
+      local dep = dependencies.dependencies[dep_name]
+      if not dep.is_header then
+         table.insert(result, self:dependency(dep_name, dep, wrap_options))
+      end
    end
 
    return table.concat(result, '\n') .. '\n'

bindgen/utils.tl

@@ -7,39 +7,52 @@ SPDX-License-Identifier: Zlib
 
 local utils = {}
 
+function utils.kpairs_to_alphabetic_ipairs<K,V>(tbl: {K:V}): ({K}, {V})
+   local keys: {K} = {}
+   local values: {V} = {}
+   for k, _ in pairs(tbl) do
+      table.insert(keys, k)
+   end
+   table.sort(keys)
+   for i, k in ipairs(keys) do
+      values[i] = tbl[k]
+   end
+   return keys, values
+end
+
 function utils.imerge<T>(...: {T}): {T}
-  local result: {T} = {}
-  for i = 1, select('#', ...) do
-    local t = select(i, ...)
-    for j = 1, #t do
-      table.insert(result, t[j])
-    end
-  end
-  return result
+   local result: {T} = {}
+   for i = 1, select('#', ...) do
+      local t = select(i, ...)
+      for j = 1, #t do
+         table.insert(result, t[j])
+      end
+   end
+   return result
 end
 
 function utils.no_repeat(values: {any}, predicate: function(any): any): {any}
-  local result: {any} = {}
-  local tbl: {any:boolean} = {}
-
-  for _, value in ipairs(values) do
-    local r: any = predicate(value)
-    if not tbl[r] then
-      table.insert(result, value)
-      tbl[r] = true
-    end
-  end
-
-  return result
+   local result: {any} = {}
+   local tbl: {any:boolean} = {}
+
+   for _, value in ipairs(values) do
+      local r: any = predicate(value)
+      if not tbl[r] then
+         table.insert(result, value)
+         tbl[r] = true
+      end
+   end
+
+   return result
 end
 
 function utils.ifindk(tbl: {any}, value: any, searcher: function(v: any): any): any
-  for _, v in ipairs(tbl) do
-    if searcher(v) == value then
-      return v
-    end
-  end
-  return nil
+   for _, v in ipairs(tbl) do
+      if searcher(v) == value then
+         return v
+      end
+   end
+   return nil
 end
 
 return utils

bindings/nelua/nene/collision.nelua

@@ -1,8 +1,8 @@
 ## cinclude '"nene/collision.h"'
 
+local Rectf = require 'nene.math.rectf'
 local Segment = require 'nene.math.segment'
 local Vec2 = require 'nene.math.vec2'
-local Rectf = require 'nene.math.rectf'
 
 -- Collision data structure.
 local Collision <cimport 'nene_Collision', nodecl> = @record{

bindings/nelua/nene/core.nelua

@@ -1,9 +1,9 @@
 ## cinclude '"nene/core.h"'
 
 ## cinclude '<SDL2/SDL.h>'
-local Vec2 = require 'nene.math.vec2'
-local Rect = require 'nene.math.rect'
 local Color = require 'nene.color'
+local Rect = require 'nene.math.rect'
+local Vec2 = require 'nene.math.vec2'
 local Vec2i = require 'nene.math.vec2i'
 
 

bindings/nelua/nene/font.nelua

@@ -1,9 +1,9 @@
 ## cinclude '"nene/font.h"'
 
-local Vec2i = require 'nene.math.vec2i'
-local Texture = require 'nene.texture'
-local Color = require 'nene.color'
 ## cinclude '<SDL2/SDL_ttf.h>'
+local Color = require 'nene.color'
+local Texture = require 'nene.texture'
+local Vec2i = require 'nene.math.vec2i'
 
 
 require 'nene.raw.sdl2_ttf'

bindings/nelua/nene/intersections.nelua

@@ -1,8 +1,8 @@
 ## cinclude '"nene/intersections.h"'
 
+local Rectf = require 'nene.math.rectf'
 local Segment = require 'nene.math.segment'
 local Vec2 = require 'nene.math.vec2'
-local Rectf = require 'nene.math.rectf'
 
 
 local Intersections = @record{}

bindings/nelua/nene/math/rect.nelua

@@ -1,7 +1,7 @@
 ## cinclude '"nene/math/rect.h"'
 
-local Vec2i = require 'nene.math.vec2i'
 ## cinclude '<SDL2/SDL.h>'
+local Vec2i = require 'nene.math.vec2i'
 
 
 require 'nene.raw.sdl2'

bindings/nelua/nene/math/shape.nelua

@@ -1,8 +1,8 @@
 ## cinclude '"nene/math/segment.h"'
 
-local Segment = require 'nene.math.segment'
 local Rect = require 'nene.math.rect'
 local Rectf = require 'nene.math.rectf'
+local Segment = require 'nene.math.segment'
 
 
 local Shape = @record{}

bindings/nelua/nene/texture.nelua

@@ -1,8 +1,8 @@
 ## cinclude '"nene/texture.h"'
 
-local Rect = require 'nene.math.rect'
 ## cinclude '<SDL2/SDL.h>'
 local Color = require 'nene.color'
+local Rect = require 'nene.math.rect'
 local Vec2 = require 'nene.math.vec2'
 
 

bindings/nelua/nene/texture_atlas.nelua

@@ -1,8 +1,8 @@
 ## cinclude '"nene/texture_atlas.h"'
 
 local Grid = require 'nene.math.grid'
-local Vec2 = require 'nene.math.vec2'
 local Texture = require 'nene.texture'
+local Vec2 = require 'nene.math.vec2'
 local Vec2i = require 'nene.math.vec2i'
 
 

bindings/nelua/nene/tilemap.nelua

@@ -1,8 +1,8 @@
 ## cinclude '"nene/tilemap.h"'
 
 local Grid = require 'nene.math.grid'
-local Vec2 = require 'nene.math.vec2'
 local TextureAtlas = require 'nene.texture_atlas'
+local Vec2 = require 'nene.math.vec2'
 local Vec2i = require 'nene.math.vec2i'
 
 

build.sh

@@ -13,7 +13,7 @@
 # you can also change the C compiler or object archiver by
 # passing arguments, like: "$ sh build.sh emcc emar"
 #
-# note: currently only clang with llvm-ar, and emcc with emar are tested.
+# Note: currently only clang with llvm-ar, and emcc with emar are tested.
 
 # utils
 build_log() {
@@ -43,13 +43,13 @@ build_log "Object achiver: $AR"
 ## warning flags
 WFLAGS="-Wall -Wextra -Wpedantic"
 
-# C standard flag
+## C standard flag
 CSTD="-std=c99"
 
-# include flags
+## include flags
 IFLAGS="-I./include/"
 
-# source files
+## source files
 SOURCES="src/*.c src/math/*.c src/audio/*.c"
 
 # clear previous build