fixup! nfy

src/luacheck/builtin_standards/init.lua

@@ -345,10 +345,10 @@ builtin_standards.sile = {
    }
 }
 
-builtin_standards.pandoc = add_defs(pandoc.common, pandoc.filter, pandoc.reader, pandoc.writer)
-builtin_standards.pandoc_filter = add_defs(pandoc.common, pandoc.filter)
-builtin_standards.pandoc_reader = add_defs(pandoc.common, pandoc.reader)
-builtin_standards.pandoc_writer = add_defs(pandoc.common, pandoc.writer)
+builtin_standards.pandoc = pandoc.pandoc
+builtin_standards.pandoc_filter = pandoc.filter
+builtin_standards.pandoc_reader = pandoc.reader
+builtin_standards.pandoc_writer = pandoc.writer
 
 builtin_standards.none = {}
 

src/luacheck/builtin_standards/pandoc.lua

@@ -1,17 +1,24 @@
+local add_std_table = require "luacheck.standards".add_std_table
+
+local function combine (...)
+   local res = {}
+   for _, input in ipairs({...}) do
+      add_std_table(res, input)
+   end
+   return res
+end
+
 local common = {
-   globals = {
-      -- Global modules
+   read_globals = {
       "pandoc", "lpeg", "re",
    },
 }
 
 -- https://pandoc.org/lua-filters.html
 local filter = {
    read_globals = {
-      -- Global variables passed to filters
       "FORMAT", "PANDOC_READER_OPTIONS", "PANDOC_WRITER_OPTIONS", "PANDOC_VERSION", "PANDOC_API_VERSION",
       "PANDOC_SCRIPT_FILE", "PANDOC_STATE",
-      -- Globals that can be used to create filter elements
    },
    globals = {
       -- - top level
@@ -40,8 +47,8 @@ local writer = {
 }
 
 return {
-    common = common,
-    filter = filter,
-    reader = reader,
-    writer = writer,
+    pandoc = combine(common, filter, reader, writer),
+    filter = combine(common, filter),
+    reader = combine(common, reader),
+    writer = combine(common, writer),
 }