- use cLib.require()

renoise · Feb 22, 2018 · 953a8ae · 953a8ae
1 parent e198597
commit 953a8ae
Show file tree

Hide file tree

Showing 14 changed files with 140 additions and 97 deletions.
diff --git a/Tools/com.renoise.AutoMate.xrnx/main.lua b/Tools/com.renoise.AutoMate.xrnx/main.lua
@@ -41,23 +41,23 @@ require (_clibroot.."cPersistence")
 require (_clibroot.."cProcessSlicer")
 
 _vlibroot = "classes/vLib/classes/"
-require (_vlibroot..'vLib')
-require (_vlibroot.."vTabs")
-require (_vlibroot..'vTable')
-require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot.."vTabs")
+cLib.require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vDialog')
 
 _xlibroot = "classes/xLib/classes/"
-require (_xlibroot.."xLib")
-require (_xlibroot.."xTrack")
-require (_xlibroot.."xSongPos")
-require (_xlibroot.."xAudioDevice")
-require (_xlibroot.."xAudioDeviceAutomation")
-require (_xlibroot.."xEnvelope")
-require (_xlibroot.."xParameterAutomation")
-require (_xlibroot.."xPatternSequencer")
-require (_xlibroot.."xSequencerSelection")
-require (_xlibroot.."xPatternSelection")
-require (_xlibroot.."xBlockLoop")
+cLib.require (_xlibroot.."xLib")
+cLib.require (_xlibroot.."xTrack")
+cLib.require (_xlibroot.."xSongPos")
+cLib.require (_xlibroot.."xAudioDevice")
+cLib.require (_xlibroot.."xAudioDeviceAutomation")
+cLib.require (_xlibroot.."xEnvelope")
+cLib.require (_xlibroot.."xParameterAutomation")
+cLib.require (_xlibroot.."xPatternSequencer")
+cLib.require (_xlibroot.."xSequencerSelection")
+cLib.require (_xlibroot.."xPatternSelection")
+cLib.require (_xlibroot.."xBlockLoop")
 
 require "classes/AutoMate"
 require "classes/AutoMatePreset"

diff --git a/Tools/com.renoise.MidiPerformer.xrnx/main.lua b/Tools/com.renoise.MidiPerformer.xrnx/main.lua
@@ -24,13 +24,13 @@ require (_clibroot..'cLib')
 require (_clibroot..'cDebug')
 require (_clibroot..'cObservable')
 
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
-require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vTable')
 
-require (_xlibroot..'xTrack')
-require (_xlibroot..'xNoteColumn')
-require (_xlibroot..'xInstrument')
+cLib.require (_xlibroot..'xTrack')
+cLib.require (_xlibroot..'xNoteColumn')
+cLib.require (_xlibroot..'xInstrument')
 
 require ('source/MidiPerformer')
 require ('source/MP_UI')

diff --git a/Tools/com.renoise.PhraseMate.xrnx/main.lua b/Tools/com.renoise.PhraseMate.xrnx/main.lua
@@ -39,25 +39,25 @@ require (_clibroot.."cParseXML")
 require (_clibroot.."cProcessSlicer")
 
 _xlibroot = 'source/xLib/classes/'
-require (_xlibroot..'xLib')
-require (_xlibroot.."xPhrase")
-require (_xlibroot..'xLinePattern')
-require (_xlibroot..'xInstrument')
-require (_xlibroot..'xNoteColumn') 
-require (_xlibroot..'xPhraseManager')
-require (_xlibroot..'xScale')
-require (_xlibroot..'xPhraseSelection')
-require (_xlibroot..'xMatrixSelection')
+cLib.require (_xlibroot..'xLib')
+cLib.require (_xlibroot.."xPhrase")
+cLib.require (_xlibroot..'xLinePattern')
+cLib.require (_xlibroot..'xInstrument')
+cLib.require (_xlibroot..'xNoteColumn') 
+cLib.require (_xlibroot..'xPhraseManager')
+cLib.require (_xlibroot..'xScale')
+cLib.require (_xlibroot..'xPhraseSelection')
+cLib.require (_xlibroot..'xMatrixSelection')
 
 _vlibroot = 'source/vLib/classes/'
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
-require (_vlibroot..'vTable')
-require (_vlibroot..'vEditField')
-require (_vlibroot..'vSearchField')
-require (_vlibroot..'vPathSelector')
-require (_vlibroot..'vPopup')
-require (_vlibroot..'vArrowButton')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vEditField')
+cLib.require (_vlibroot..'vSearchField')
+cLib.require (_vlibroot..'vPathSelector')
+cLib.require (_vlibroot..'vPopup')
+cLib.require (_vlibroot..'vArrowButton')
 
 require ('source/PhraseMate')
 require ('source/PhraseMateUI')

diff --git a/Tools/com.renoise.SliceMate.xrnx/main.lua b/Tools/com.renoise.SliceMate.xrnx/main.lua
@@ -26,22 +26,22 @@ require (_clibroot..'cLib')
 require (_clibroot..'cDebug')
 require (_clibroot..'cReflection')
 
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
-require (_vlibroot..'vTable')
-require (_vlibroot..'vToggleButton')
-
-require (_xlibroot..'xLine')
-require (_xlibroot..'xLinePattern')
-require (_xlibroot..'xTrack')
-require (_xlibroot..'xPatternSequencer')
-require (_xlibroot..'xSongPos')
-require (_xlibroot..'xBlockLoop')
-require (_xlibroot..'xCursorPos')
-require (_xlibroot..'xInstrument')
-require (_xlibroot..'xNoteCapture')
-require (_xlibroot..'xColumns')
-require (_xlibroot..'xSample')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vToggleButton')
+
+cLib.require (_xlibroot..'xLine')
+cLib.require (_xlibroot..'xLinePattern')
+cLib.require (_xlibroot..'xTrack')
+cLib.require (_xlibroot..'xPatternSequencer')
+cLib.require (_xlibroot..'xSongPos')
+cLib.require (_xlibroot..'xBlockLoop')
+cLib.require (_xlibroot..'xCursorPos')
+cLib.require (_xlibroot..'xInstrument')
+cLib.require (_xlibroot..'xNoteCapture')
+cLib.require (_xlibroot..'xColumns')
+cLib.require (_xlibroot..'xSample')
 
 require ('source/SliceMate')
 require ('source/SliceMate_UI')

diff --git a/Tools/com.renoise.VoiceRunner.xrnx/main.lua b/Tools/com.renoise.VoiceRunner.xrnx/main.lua
@@ -32,22 +32,22 @@ require (_clibroot..'cFilesystem')
 require (_clibroot..'cProcessSlicer')
 require (_clibroot..'cColor')
 
-require (_xlibroot..'xLib')
-require (_xlibroot..'xColumns') 
-require (_xlibroot..'xEffectColumn') 
-require (_xlibroot..'xInstrument')
-require (_xlibroot..'xLinePattern')
-require (_xlibroot..'xMidiCommand')
-require (_xlibroot..'xNoteColumn') 
-require (_xlibroot..'xMatrixSelection')
-require (_xlibroot..'xPatternSelection')
-require (_xlibroot..'xPhraseSelection')
-require (_xlibroot..'xTrack') 
-require (_xlibroot..'xVoiceRunner') 
-require (_xlibroot..'xVoiceSorter') 
-
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
+cLib.require (_xlibroot..'xLib')
+cLib.require (_xlibroot..'xColumns') 
+cLib.require (_xlibroot..'xEffectColumn') 
+cLib.require (_xlibroot..'xInstrument')
+cLib.require (_xlibroot..'xLinePattern')
+cLib.require (_xlibroot..'xMidiCommand')
+cLib.require (_xlibroot..'xNoteColumn') 
+cLib.require (_xlibroot..'xMatrixSelection')
+cLib.require (_xlibroot..'xPatternSelection')
+cLib.require (_xlibroot..'xPhraseSelection')
+cLib.require (_xlibroot..'xTrack') 
+cLib.require (_xlibroot..'xVoiceRunner') 
+cLib.require (_xlibroot..'xVoiceSorter') 
+
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
 
 require ('source/VR')
 require ('source/VR_UI')

diff --git a/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cFilesystem.lua b/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cFilesystem.lua
@@ -8,7 +8,7 @@ _tests:insert({
 name = "cFilesystem",
 fn = function()
 
-  require (_clibroot.."cFilesystem")
+  cLib.require (_clibroot.."cFilesystem")
   _trace_filters = {"^cFilesystem*"}
 
   local absolute_path = renoise.tool().bundle_path .. "/cFilesystem_test/"

diff --git a/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cNumber.lua b/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cNumber.lua
@@ -10,7 +10,7 @@ fn = function()
 
   LOG(">>> cNumber: starting unit-test...")
 
-  require (_clibroot.."cNumber")
+  cLib.require (_clibroot.."cNumber")
   _trace_filters = {"^cNumber*"}
 
   -- basic accessors

diff --git a/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cParseXML.lua b/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cParseXML.lua
@@ -10,7 +10,7 @@ fn = function()
 
   print (">>> cParseXML: starting unit-test...")
 
-  require (_clibroot.."cParseXML")
+  cLib.require (_clibroot.."cParseXML")
   _trace_filters = {"^cParseXML*"}
 
   -- First try with some broken XML

diff --git a/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cReflection.lua b/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cReflection.lua
@@ -10,7 +10,7 @@ fn = function()
 
   LOG(">>> cReflection: starting unit-test...")
 
-  require (_clibroot.."cReflection")
+  cLib.require (_clibroot.."cReflection")
   _trace_filters = {"^cReflection*"}
 
   -- basename

diff --git a/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cTable.lua b/Tools/com.renoise.cLib.xrnx/unit_tests/Test-cTable.lua
@@ -0,0 +1,43 @@
+--[[
+local foo = {1,2,3}
+local bar = {
+  one = 1,
+  two = 2,
+  three = 3
+}
+local baz = {
+  one = 1,
+  two = 2,
+  three = 3,
+  4,
+}
+
+function table_count(t)
+  local n=0
+  if ("table" == type(t)) then
+    for key in pairs(t) do
+      n = n + 1
+    end
+    return n
+  else
+    return nil
+  end
+end
+
+print("foo",table_count(foo))
+print("bar",table_count(bar))
+rprint(bar)
+
+local function isArray(t)
+  local i = 0
+  for _ in pairs(t) do
+    i = i + 1
+    if t[i] == nil then return false end
+  end
+  return true
+end
+
+print("isArray foo",isArray(foo))
+print("isArray bar",isArray(bar))
+print("isArray baz",isArray(baz))
+]]
diff --git a/Tools/com.renoise.vLibBoilerPlate.xrnx/main.lua b/Tools/com.renoise.vLibBoilerPlate.xrnx/main.lua
@@ -23,9 +23,9 @@ _trace_filters = {".*"} -- trace everything
 require (_clibroot..'cLib')
 require (_clibroot..'cDebug')
 
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
-require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vTable')
 
 require ('source/vLibBoilerPlate_UI')
 require ('source/vLibBoilerPlate_Prefs')

diff --git a/Tools/com.renoise.xCleaner.xrnx/main.lua b/Tools/com.renoise.xCleaner.xrnx/main.lua
@@ -21,17 +21,17 @@ require (_clibroot.."cProcessSlicer")
 require (_clibroot.."cString")
 require (_clibroot.."cTable")
 
-require (_xlibroot.."xLib")
-require (_xlibroot.."xPhrase")
-require (_xlibroot.."xSample")
-require (_xlibroot.."xSampleMapping")
-require (_xlibroot.."xNoteColumn")
-require (_xlibroot.."xInstrument")
-require (_xlibroot.."xAudioDevice")
-
-require (_vlibroot.."vLib")
-require (_vlibroot.."vTable")
-require (_vlibroot.."vTabs")
+cLib.require (_xlibroot.."xLib")
+cLib.require (_xlibroot.."xPhrase")
+cLib.require (_xlibroot.."xSample")
+cLib.require (_xlibroot.."xSampleMapping")
+cLib.require (_xlibroot.."xNoteColumn")
+cLib.require (_xlibroot.."xInstrument")
+cLib.require (_xlibroot.."xAudioDevice")
+
+cLib.require (_vlibroot.."vLib")
+cLib.require (_vlibroot.."vTable")
+cLib.require (_vlibroot.."vTabs")
 
 require ("source/xCleaner")
 require ("source/xCleanerUI")

diff --git a/Tools/com.renoise.xLib.xrnx/main.lua b/Tools/com.renoise.xLib.xrnx/main.lua
@@ -29,11 +29,11 @@ require (_clibroot.."cTable")
 require (_clibroot.."cDebug")
 require (_clibroot.."cFilesystem")
 
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
-require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vTable')
 
-require (_xlibroot.."xLib")
+cLib.require (_xlibroot.."xLib")
 
 require ('source/TestRunner')
 

diff --git a/Tools/com.renoise.xStream.xrnx/main.lua b/Tools/com.renoise.xStream.xrnx/main.lua
@@ -34,11 +34,11 @@ require (_clibroot..'cParseXML')
 require (_clibroot..'cSandbox')
 require (_clibroot..'cColor')
 
-require (_vlibroot..'vLib')
-require (_vlibroot..'vDialog')
-require (_vlibroot..'vDialogWizard')
-require (_vlibroot..'vPrompt')
-require (_vlibroot..'vTable')
+cLib.require (_vlibroot..'vLib')
+cLib.require (_vlibroot..'vDialog')
+cLib.require (_vlibroot..'vDialogWizard')
+cLib.require (_vlibroot..'vPrompt')
+cLib.require (_vlibroot..'vTable')
 
 cLib.require (_xlibroot..'xLib')
 cLib.require (_xlibroot..'xLFO')