Internal pragmas

.gitignore

@@ -1,4 +1,5 @@
 nelua_cache
 *.out
 .vscode
-tempCodeRunner.*
+tempCodeRunner.*
+neluacfg.lua

examples/condots.nelua

@@ -1,4 +1,4 @@
-!!strict
+## strict = true
 
 ## if EMSCRIPTEN then
 --TODO: default output file as html for emcc

examples/snakesdl.nelua

@@ -2,9 +2,9 @@
 
 -- import SDL headers
 !!strict
-!!cdefine 'SDL_DISABLE_IMMINTRIN_H'
-!!cinclude '<SDL2/SDL.h>'
-!!linklib 'SDL2'
+!!cdefine('SDL_DISABLE_IMMINTRIN_H')
+!!cinclude('<SDL2/SDL.h>')
+!!linklib('SDL2')
 
 -- import SDL structures
 local SDL_Event !cimport = @record {

lib/math.nelua

@@ -1,6 +1,6 @@
-## state.strict = true
-## state.modname = 'nelua'
-## state.nohashcodenames = true
+## strict = true
+## modname = 'nelua'
+## nohashcodenames = true
 
 --TODO: function type overload
 

lib/memory.nelua

@@ -1,6 +1,6 @@
-## state.strict = true
-## state.modname = 'nelua'
-## state.nohashcodenames = true
+## strict = true
+## modname = 'nelua'
+## nohashcodenames = true
 
 !!cinclude '<stdlib.h>'
 !!cinclude '<string.h>'

lib/mystring.nelua

@@ -4,7 +4,7 @@
 --TODO: varargs
 --TODO: optional parameters/returns
 
-## state.modname = 'mystring'
+## modname = 'mystring'
 
 --------------------------------------------------------------------------------
 -- C imports

nelua/astdefs.lua

@@ -62,6 +62,17 @@ astbuilder:register('Attrib', {
   stypes.array_of(ntypes.String + ntypes.Number + ntypes.Boolean) -- args
 })
 
+-- used inerally internal
+astbuilder:register('PragmaCall', {
+  stypes.string, -- name
+  stypes.table, -- args exprs
+})
+
+astbuilder:register('PragmaSet', {
+  stypes.string, -- name
+  stypes.any, -- value
+})
+
 -- identifier and types
 astbuilder:register('Id', {
   stypes.string + ntypes.PreprocessName, -- name

nelua/cgenerator.lua

@@ -207,6 +207,11 @@ end
 
 -- TODO: Function
 
+function visitors.PragmaSet(context, node)
+  local name, value = node:args()
+  context[name] = value
+end
+
 function visitors.Attrib(context, node, emitter)
   local attr = node.attr
   if attr.cinclude then

nelua/configer.lua

@@ -97,7 +97,7 @@ local function init_default_configs()
 end
 
 local function load_home_configs()
-  local homeconfigfile = fs.join(fs.getuserconfpath(), '.nelua.lua')
+  local homeconfigfile = fs.getuserconfpath('neluacfg.lua')
   if not fs.isfile(homeconfigfile) then return end
   local homeconfig = dofile(homeconfigfile)
   tabler.update(defconfig, homeconfig)

nelua/context.lua

@@ -36,7 +36,6 @@ local function traverser_default_visitor(self, node, ...)
 end
 
 function Context:_init(visitors, default_visitor, parentcontext)
-  self.state = {}
   if parentcontext then
     self.rootscope = parentcontext.rootscope
     self.builtins = parentcontext.builtins
@@ -52,6 +51,7 @@ function Context:_init(visitors, default_visitor, parentcontext)
   elseif default_visitor then
     self.default_visitor = default_visitor
   end
+  self.strict = false
   self.nodes = {}
 end
 

nelua/preprocessor.lua

@@ -29,6 +29,21 @@ function PPContext:_init(context, visitors)
   self.registry = {}
 end
 
+function PPContext:push_statnodes()
+  local statnodes = {oldstatnodes = self.statnodes}
+  self.statnodes = statnodes
+  return statnodes
+end
+
+function PPContext:pop_statnodes()
+  self.statnodes = self.statnodes.oldstatnodes
+end
+
+function PPContext:add_statnode(node)
+  table.insert(self.statnodes, node)
+  self.context:traverse(node)
+end
+
 function PPContext.toname(_, val, orignode)
   orignode:assertraisef(traits.is_string(val),
     'unable to convert preprocess value of type "%s" to a compile time name', type(val))
@@ -154,7 +169,7 @@ function visitors.Block(ppcontext, node, emitter, parent)
   node.needprocess = false
 
   emitter:add_ln('do')
-  emitter:add_ln('local ppnewstatnodes = {}')
+  emitter:add_ln('local ppnewstatnodes = ppcontext:push_statnodes()')
   emitter:add_ln('ppregistry[', ppcontext:getregistryindex(node), '][1] = ppnewstatnodes')
   emitter:add_ln('context:push_scope("block")')
   for _,statnode in ipairs(statnodes) do
@@ -164,12 +179,11 @@ function visitors.Block(ppcontext, node, emitter, parent)
       emitter:add_ln('do')
       emitter:add_ln('local ppstatnode = ppregistry[', ppcontext:getregistryindex(statnode), ']')
       ppcontext:traverse(statnode, emitter)
-      emitter:add_ln('local ppnewstatnode =  ppstatnode:clone()')
-      emitter:add_ln('table.insert(ppnewstatnodes, ppnewstatnode)')
-      emitter:add_ln('context:traverse(ppnewstatnode)')
+      emitter:add_ln('ppcontext:add_statnode(ppstatnode:clone())')
       emitter:add_ln('end')
     end
   end
+  emitter:add_ln('ppcontext:pop_statnodes()')
   emitter:add_ln('context:pop_scope()')
   emitter:add_ln('end')
 end
@@ -212,6 +226,17 @@ function marker_visitors.Block(markercontext, node)
   end
 end
 
+local ppenvgetfields = {}
+function ppenvgetfields:scope()
+  return self.context.scope
+end
+function ppenvgetfields:ast()
+  return self.context:get_top_node()
+end
+function ppenvgetfields:symbols()
+  return self.context.scope.symbols
+end
+
 local preprocessor = {}
 function preprocessor.preprocess(context, ast)
   assert(ast.tag == 'Block')
@@ -230,30 +255,37 @@ function preprocessor.preprocess(context, ast)
 
   -- second pass, emit the preprocess lua code
   local ppcontext = PPContext(context, visitors)
+  local aster = context.astbuilder.aster
   local emitter = Emitter(ppcontext, 0)
+  emitter:add_ln("local ppcontext = ppcontext")
+  emitter:add_ln("local ppregistry = ppcontext.registry")
+  emitter:add_ln("local context = ppcontext.context")
   ppcontext:traverse(ast, emitter)
 
   -- generate the preprocess function
   local ppcode = emitter:generate()
-  local env = setmetatable({
+  local env
+  env = setmetatable({
     context = context,
-    aster = context.astbuilder.aster,
     ppcontext = ppcontext,
-    ppregistry = ppcontext.registry
+    aster = aster,
+    addnode = function(node) ppcontext:add_statnode(node) end,
+    config = config
   }, { __index = function(_, key)
-    if key == 'scope' then
-      return context.scope
-    elseif key == 'ast' then
-      return context:get_top_node()
-    elseif key == 'symbols' then
-      return context.scope.symbols
-    elseif key == 'state' then
-      return context.state
-    elseif key == 'config' then
-      return config
+    local ppenvfield = ppenvgetfields[key]
+    if ppenvfield then
+      return ppenvfield(env)
+    elseif typedefs.field_pragmas[key] then
+      return context[key]
     else
       return _G[key]
     end
+  end, __newindex = function(_, key, value)
+    if typedefs.field_pragmas[key] then
+      ppcontext:add_statnode(aster.PragmaSet{key, value})
+    else
+      env[key] = value
+    end
   end})
 
   -- try to run the preprocess otherwise capture and show the error

nelua/scope.lua

@@ -58,7 +58,7 @@ function Scope:get_symbol(name, node, required)
       end
     end
   end
-  if not symbol and required and self.context.state.strict and not self.context.preprocessing then
+  if not symbol and required and self.context.strict and not self.context.preprocessing then
     node:raisef("undeclared symbol '%s'", name)
   end
   return symbol
@@ -83,7 +83,7 @@ function Scope:add_symbol(symbol)
   assert(name)
   local oldsymbol = self.symbols[name]
   if oldsymbol and (not oldsymbol.node or oldsymbol.node ~= symbol.node) then
-    symbol.node:assertraisef(not self.context.state.strict,
+    symbol.node:assertraisef(not self.context.strict,
       "symbol '%s' shadows pre declared symbol with the same name", name)
 
     if rawget(self.symbols, name) == oldsymbol then
@@ -93,8 +93,8 @@ function Scope:add_symbol(symbol)
 
     symbol.attr.shadowed = true
   end
-  if self.context.state.modname then
-    symbol.attr.modname = self.context.state.modname
+  if self.context.modname then
+    symbol.attr.modname = self.context.modname
   end
   self.symbols[name] = symbol
   return symbol

nelua/typechecker.lua

@@ -215,6 +215,13 @@ function visitors.Table(context, node, desiredtype)
   end
 end
 
+function visitors.PragmaSet(context, node)
+  local name, value = node:args()
+  local pragmashape = typedefs.field_pragmas[name]
+  node:assertraisef(pragmashape, "pragma '%s' is not defined", name)
+  context[name] = value
+end
+
 function visitors.Attrib(context, node, symbol)
   --TODO: quick return
 
@@ -287,7 +294,7 @@ function visitors.Attrib(context, node, symbol)
     end
   end
   if name == 'strict' then
-    context.state.strict = true
+    context.strict = true
   end
 end
 
@@ -379,8 +386,8 @@ function visitors.TypeInstance(context, node, _, symbol)
 
   if symbol and not attr.holdedtype:is_primitive() then
     local prefix
-    if context.state.nohashcodenames then
-      prefix = context.state.modname or context.ast.modname
+    if context.nohashcodenames then
+      prefix = context.modname or context.ast.modname
     end
     attr.holdedtype:suggest_nick(symbol.name, prefix)
   end
@@ -1122,7 +1129,7 @@ function visitors.VarDecl(context, node)
       varnode:assertraisef(context.scope:is_static_storage(), 'global variables can only be declared in top scope')
       varnode.attr.global = true
     end
-    if context.state.nostatic then
+    if context.nostatic then
       varnode.attr.nostatic = true
     end
     local symbol = context:traverse(varnode)
@@ -1157,7 +1164,7 @@ function visitors.VarDecl(context, node)
         valnode.attr.initializer = true
       end
     else
-      if context.state.noinit then
+      if context.noinit then
         varnode.attr.noinit = true
       end
     end
@@ -1618,10 +1625,10 @@ function typechecker.analyze(ast, parser, parentcontext)
   end)
 
   -- forward global attributes to ast
-  if context.state.nocore then
+  if context.nocore then
     ast.attr.nocore = true
   end
-  if context.state.nofloatsuffix then
+  if context.nofloatsuffix then
     ast.attr.nofloatsuffix = true
   end
 

nelua/typedefs.lua

@@ -354,6 +354,25 @@ typedefs.block_attribs = {
   strict = true
 }
 
+typedefs.call_pragmas = {
+  cinclude = shaper.shape{shaper.string},
+  cemit = shaper.shape{shaper.string, shaper.string:is_optional()},
+  cdefine = shaper.shape{shaper.string},
+  cflags = shaper.shape{shaper.string},
+  ldflags = shaper.shape{shaper.string},
+  linklib = shaper.shape{shaper.string},
+}
+
+typedefs.field_pragmas = {
+  strict = shaper.shape{shaper.boolean},
+  nohashcodenames = shaper.shape{shaper.boolean},
+  noinit = shaper.shape{shaper.boolean},
+  nostatic = shaper.shape{shaper.boolean},
+  nofloatsuffix = shaper.shape{shaper.boolean},
+  nocore = shaper.shape{shaper.boolean},
+  modname = shaper.shape{shaper.string},
+}
+
 local common_attribs = {
   cimport = shaper.shape{shaper.string:is_optional(), (shaper.boolean + shaper.string):is_optional()},
   onestring = shaper.shape{shaper.string},

nelua/utils/fs.lua

@@ -53,8 +53,8 @@ function fs.getdatapath(arg0)
   return path
 end
 
-function fs.getuserconfpath()
-  return plpath.expanduser('~')
+function fs.getuserconfpath(filename)
+  return plpath.expanduser(fs.join('~', '.config', 'nelua', filename))
 end
 
 function fs.findmodulefile(name, path)