From 1dd35e86a0c4f1ed2cd14fb1369533e0c0f2d5e7 Mon Sep 17 00:00:00 2001 From: steve donovan Date: Tue, 20 Sep 2011 12:59:34 +0200 Subject: [PATCH] great renaming: moved everything into ldoc module tree --- ldoc.lua | 4 ++-- {builtin => ldoc/builtin}/coroutine.luadoc | 0 {builtin => ldoc/builtin}/debug.luadoc | 0 {builtin => ldoc/builtin}/global.luadoc | 0 {builtin => ldoc/builtin}/globals.lua | 0 {builtin => ldoc/builtin}/io.luadoc | 0 {builtin => ldoc/builtin}/lfs.luadoc | 0 {builtin => ldoc/builtin}/lpeg.luadoc | 0 {builtin => ldoc/builtin}/math.luadoc | 0 {builtin => ldoc/builtin}/os.luadoc | 0 {builtin => ldoc/builtin}/package.luadoc | 0 {builtin => ldoc/builtin}/string.luadoc | 0 {builtin => ldoc/builtin}/table.luadoc | 0 ldoc/doc.lua | 2 +- {html => ldoc/html}/ldoc_css.lua | 0 {html => ldoc/html}/ldoc_ltp.lua | 0 {html => ldoc/html}/ldoc_one_css.lua | 0 ldoc/prettify.lua | 2 +- 18 files changed, 4 insertions(+), 4 deletions(-) rename {builtin => ldoc/builtin}/coroutine.luadoc (100%) rename {builtin => ldoc/builtin}/debug.luadoc (100%) rename {builtin => ldoc/builtin}/global.luadoc (100%) rename {builtin => ldoc/builtin}/globals.lua (100%) rename {builtin => ldoc/builtin}/io.luadoc (100%) rename {builtin => ldoc/builtin}/lfs.luadoc (100%) rename {builtin => ldoc/builtin}/lpeg.luadoc (100%) rename {builtin => ldoc/builtin}/math.luadoc (100%) rename {builtin => ldoc/builtin}/os.luadoc (100%) rename {builtin => ldoc/builtin}/package.luadoc (100%) rename {builtin => ldoc/builtin}/string.luadoc (100%) rename {builtin => ldoc/builtin}/table.luadoc (100%) rename {html => ldoc/html}/ldoc_css.lua (100%) rename {html => ldoc/html}/ldoc_ltp.lua (100%) rename {html => ldoc/html}/ldoc_one_css.lua (100%) diff --git a/ldoc.lua b/ldoc.lua index 942350c..804e55b 100644 --- a/ldoc.lua +++ b/ldoc.lua @@ -49,7 +49,7 @@ local args = lapp(usage) local doc = require 'ldoc.doc' local lang = require 'ldoc.lang' local tools = require 'ldoc.tools' -local global = require 'builtin.globals' +local global = require 'ldoc.builtin.globals' local markup = require 'ldoc.markup' local parse = require 'ldoc.parse' local KindMap = tools.KindMap @@ -501,7 +501,7 @@ if args.style == '!' or args.template == '!' then lfs.mkdir(tmpdir) end local function tmpwrite (name) - utils.writefile(path.join(tmpdir,name),require('html.'..name:gsub('%.','_'))) + utils.writefile(path.join(tmpdir,name),require('ldoc.html.'..name:gsub('%.','_'))) end if args.style == '!' then tmpwrite(ldoc.templ) diff --git a/builtin/coroutine.luadoc b/ldoc/builtin/coroutine.luadoc similarity index 100% rename from builtin/coroutine.luadoc rename to ldoc/builtin/coroutine.luadoc diff --git a/builtin/debug.luadoc b/ldoc/builtin/debug.luadoc similarity index 100% rename from builtin/debug.luadoc rename to ldoc/builtin/debug.luadoc diff --git a/builtin/global.luadoc b/ldoc/builtin/global.luadoc similarity index 100% rename from builtin/global.luadoc rename to ldoc/builtin/global.luadoc diff --git a/builtin/globals.lua b/ldoc/builtin/globals.lua similarity index 100% rename from builtin/globals.lua rename to ldoc/builtin/globals.lua diff --git a/builtin/io.luadoc b/ldoc/builtin/io.luadoc similarity index 100% rename from builtin/io.luadoc rename to ldoc/builtin/io.luadoc diff --git a/builtin/lfs.luadoc b/ldoc/builtin/lfs.luadoc similarity index 100% rename from builtin/lfs.luadoc rename to ldoc/builtin/lfs.luadoc diff --git a/builtin/lpeg.luadoc b/ldoc/builtin/lpeg.luadoc similarity index 100% rename from builtin/lpeg.luadoc rename to ldoc/builtin/lpeg.luadoc diff --git a/builtin/math.luadoc b/ldoc/builtin/math.luadoc similarity index 100% rename from builtin/math.luadoc rename to ldoc/builtin/math.luadoc diff --git a/builtin/os.luadoc b/ldoc/builtin/os.luadoc similarity index 100% rename from builtin/os.luadoc rename to ldoc/builtin/os.luadoc diff --git a/builtin/package.luadoc b/ldoc/builtin/package.luadoc similarity index 100% rename from builtin/package.luadoc rename to ldoc/builtin/package.luadoc diff --git a/builtin/string.luadoc b/ldoc/builtin/string.luadoc similarity index 100% rename from builtin/string.luadoc rename to ldoc/builtin/string.luadoc diff --git a/builtin/table.luadoc b/ldoc/builtin/table.luadoc similarity index 100% rename from builtin/table.luadoc rename to ldoc/builtin/table.luadoc diff --git a/ldoc/doc.lua b/ldoc/doc.lua index d71c668..a0de22f 100644 --- a/ldoc/doc.lua +++ b/ldoc/doc.lua @@ -5,7 +5,7 @@ require 'pl' local doc = {} -local global = require 'builtin.globals' +local global = require 'ldoc.builtin.globals' local tools = require 'ldoc.tools' local split_dotted_name = tools.split_dotted_name diff --git a/html/ldoc_css.lua b/ldoc/html/ldoc_css.lua similarity index 100% rename from html/ldoc_css.lua rename to ldoc/html/ldoc_css.lua diff --git a/html/ldoc_ltp.lua b/ldoc/html/ldoc_ltp.lua similarity index 100% rename from html/ldoc_ltp.lua rename to ldoc/html/ldoc_ltp.lua diff --git a/html/ldoc_one_css.lua b/ldoc/html/ldoc_one_css.lua similarity index 100% rename from html/ldoc_one_css.lua rename to ldoc/html/ldoc_one_css.lua diff --git a/ldoc/prettify.lua b/ldoc/prettify.lua index 8a26da6..a156a44 100644 --- a/ldoc/prettify.lua +++ b/ldoc/prettify.lua @@ -5,7 +5,7 @@ -- `@{example:test-fun}`. require 'pl' local lexer = require 'ldoc.lexer' -local globals = require 'builtin.globals' +local globals = require 'ldoc.builtin.globals' local tnext = lexer.skipws local prettify = {}