diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc index 0c22f123..7f8a650e 100644 --- a/doc/manual.asciidoc +++ b/doc/manual.asciidoc @@ -648,14 +648,17 @@ are supported: === Syntax Extensions === -Tundra provides a small set of syntax extensions by default. +Tundra provides a small set of syntax extensions by default. To use syntax +extensions, add a SyntaxExtensions list to the `tundra.lua` file specifying the +extensions you want to enable. These are Lua package names. ==== File Globbing ==== -Globbing basically means pattern matching over filenames. It is a convenient -way to use the filesystem as the index of what files to build rather than to -manually type every file out in the `Sources` list. You can also combine the -two for greater control by mixing globs and filenames. +The `tundra.syntax.glob` extension provides file globbing (pattern matching +over filenames.) It is a convenient way to use the filesystem as the index of +what files to build rather than to manually type every file out in the +`Sources` list. You can also combine the two for greater control by mixing +globs and filenames. Globs come in two versions, `Glob` and `FGlob`. diff --git a/scripts/tundra/boot.lua b/scripts/tundra/boot.lua index fd1877f3..c346a4be 100644 --- a/scripts/tundra/boot.lua +++ b/scripts/tundra/boot.lua @@ -140,7 +140,7 @@ function load_toolset(id, ...) end function load_syntax(id, decl, passes) - apply_extension_module(id, "tundra.syntax.", decl, passes) + apply_extension_module(id, "", decl, passes) end local function member(list, item) diff --git a/tundra.lua b/tundra.lua index 0af80442..f71e64b6 100644 --- a/tundra.lua +++ b/tundra.lua @@ -46,7 +46,7 @@ Build { LuaCompile = { Name = "Compile Lua sources for embedding", BuildOrder = 2 }, Tundra = { Name = "Main compile pass", BuildOrder = 3 }, }, - SyntaxExtensions = { "glob", "embed_lua" }, + SyntaxExtensions = { "tundra.syntax.glob", "tundra.syntax.embed_lua" }, Configs = { Config { Name = "macosx-clang", Inherit = common, Tools = { "clang-osx" }, DefaultOnHost = "macosx" }, Config { Name = "macosx-gcc", Inherit = common, Tools = { "gcc-osx" } },