Move macros from neat.macros to std.macro.

Author: FeepingCreature

bootstrap.sh

@@ -608,6 +608,8 @@ at_revision '226f68d29e6d798555b9ba142019486d32ba6218' 'rebuild neat' 'build/nea
 at_revision 'ec4a2b8954239f14ce2bc8d7c641acc646639d1a' 'rebuild neat' 'build/neat'
 # Propagate error, rewrite ASTImportStatement, ASTFormatString quoting.
 at_revision '9d89d88d718feddee58f33a51b2429c4250a4d1d' 'rebuild neat' 'build/neat'
+# neat.base/neat.util split
+at_revision '6c60f500e9fffd5a0b412faebf6413d9d872c3bd' 'rebuild neat' 'build/neat'
 
 # unpack the last tagfile
 unpack_tagfile

demos/fflame.nt

@@ -1,8 +1,8 @@
 module fflame;
 
-macro import neat.macros.assert;
-macro import neat.macros.cimport;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.cimport;
+macro import std.macro.listcomprehension;
 
 import c_header("SDL2/SDL.h");
 import c_header("SDL2/SDL_image.h");

demos/fib.nt

@@ -1,6 +1,6 @@
 module fib;
 
-macro import neat.macros.assert;
+macro import std.macro.assert;
 
 import std.stdio;
 import std.string : atoi;

demos/glfw.nt

@@ -1,7 +1,7 @@
 module glfw;
 
-macro import neat.macros.assert;
-macro import neat.macros.cimport;
+macro import std.macro.assert;
+macro import std.macro.cimport;
 
 import c_header("GL/gl.h");
 import c_header("GL/glext.h", "-include GL/gl.h -DGL_GLEXT_PROTOTYPES");

demos/gtk.nt

@@ -1,6 +1,6 @@
 module gtk;
 
-macro import neat.macros.cimport;
+macro import std.macro.cimport;
 import std.stdio;
 
 import c_header("glib.h");

demos/longestline.nt

@@ -1,6 +1,6 @@
 module longestline;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import std.file;
 import std.stdio;

doc/sphinx/index.rst

@@ -10,7 +10,7 @@ Have some example code! Here's a program that prints the longest line in a file:
 
     module longestline;
 
-    macro import neat.macros.listcomprehension;
+    macro import std.macro.listcomprehension;
 
     import std.file;
     import std.stdio;

doc/sphinx/manual.rst

@@ -101,7 +101,8 @@ For example::
 
     extern(C) void* memcpy(void* dest, void* src, size_t n);
 
-Note: instead of declaring lots of extern(C) functions manually, try using the `neat.macros.cimport` built-in macro! (Grep for examples.)
+Note: instead of declaring lots of extern(C) functions manually, try using the
+`std.macro.cimport` built-in macro! (Grep for examples.)
 
 Expressions
 -----------
@@ -628,7 +629,7 @@ Macro classes can extend the compiler with new functionality using a set of hook
 - statements: `macroThing;`
 - imports: `import github("http://github.com/neat-lang/example").module;`
 
-Look at `neat.macros.*` for examples.
+Look at `std.macro.*` for examples.
 
 The entire compiler is available for importing and reuse in macros. However, it is recommended
 to limit yourself to the functionality in `neat.base`. This will also keep compile times down.

rebuild.sh

@@ -40,9 +40,14 @@ fi
 cp src/runtime.c build/src/
 rm build/neat.ini || true
 
+# turn off pass version flags on the next pass to avoid re-running into them
+# use this opportunity to remove them
+PASSFLAGS="-version='firstpass' -macro-version='firstpassmacro'"
+if grep -qR 'firstpass' build/src; then PASSFLAGS=""; fi
+
 I=1
 NEXT=compiler$(($(build/neat -print-generation) + 1))
-build/neat $FLAGS -next-generation -version='firstpass' -macro-version='firstpassmacro' \
+build/neat $FLAGS -next-generation ${PASSFLAGS} \
     -P$NEXT:src -Pcompiler:build/src src/main.nt -o build/neat_test$I
 
 if [ \! -z ${FAST+x} ]

src/backend/c.nt

@@ -3,7 +3,7 @@ module backend.c;
 import backend.base;
 import neat.hash;
 import helpers;
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 class CBackend : Backend {
     this() { }

src/backend/llvm.nt

@@ -1,8 +1,8 @@
 module backend.llvm;
 
-macro import neat.macros.assert;
-macro import neat.macros.cimport;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.cimport;
+macro import std.macro.listcomprehension;
 
 import backend.base;
 import neat.hash;

src/main.nt

@@ -1,6 +1,6 @@
 module main;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import backend.base;
 import backend.c;
@@ -691,7 +691,7 @@ class Options
     bool noMain;
     bool cpr; // critical path report
     PlatformFlags platformFlags, macroPlatformFlags;
-    string[] cFlags; // for neat.macros.cimport
+    string[] cFlags; // for std.macro.cimport
     string[] versions, macroVersions;
     string docGenFolder;
     string runningCompilerVersion;

src/neat/array.nt

@@ -1,8 +1,8 @@
 module neat.array;
 
-macro import neat.macros.hash;
-macro import neat.macros.once;
-macro import neat.macros.quasiquoting;
+macro import std.macro.hash;
+macro import std.macro.once;
+macro import std.macro.quasiquoting;
 
 import backend.base;
 import helpers;

src/neat/base.nt

@@ -554,7 +554,7 @@ abstract class CompilerBase
 {
     WorkPoolBase workPool;
 
-    // for neat.macros.cimport
+    // for std.macro.cimport
     string[] cFlags;
 
     // parser

src/neat/class_.nt

@@ -1,8 +1,8 @@
 module neat.class_;
 
-macro import neat.macros.listcomprehension;
-macro import neat.macros.once;
-macro import neat.macros.quasiquoting;
+macro import std.macro.listcomprehension;
+macro import std.macro.once;
+macro import std.macro.quasiquoting;
 
 import backend.base;
 import helpers;

src/neat/compiler.nt

@@ -1,8 +1,8 @@
 module neat.compiler;
 
-macro import neat.macros.assert;
-macro import neat.macros.listcomprehension;
-macro import neat.macros.once;
+macro import std.macro.assert;
+macro import std.macro.listcomprehension;
+macro import std.macro.once;
 
 import backend.base;
 import neat.array;

src/neat/docgen.nt

@@ -1,6 +1,6 @@
 module neat.docgen;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import neat.base;
 import neat.class_;

src/neat/either.nt

@@ -1,6 +1,6 @@
 module neat.either;
 
-macro import neat.macros.quasiquoting;
+macro import std.macro.quasiquoting;
 
 import backend.base;
 import helpers;

src/neat/enums.nt

@@ -1,6 +1,6 @@
 module neat.enums;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import backend.base;
 import helpers;

src/neat/expr.nt

@@ -1,7 +1,7 @@
 module neat.expr;
 
-macro import neat.macros.hash;
-macro import neat.macros.once;
+macro import std.macro.hash;
+macro import std.macro.once;
 
 import backend.base;
 import helpers;

src/neat/formatstring.nt

@@ -1,7 +1,7 @@
 module neat.formatstring;
 
-macro import neat.macros.listcomprehension;
-macro import neat.macros.quasiquoting;
+macro import std.macro.listcomprehension;
+macro import std.macro.quasiquoting;
 
 import neat.array;
 import neat.base;

src/neat/function_.nt

@@ -1,7 +1,7 @@
 module neat.function_;
 
-macro import neat.macros.listcomprehension;
-macro import neat.macros.once;
+macro import std.macro.listcomprehension;
+macro import std.macro.once;
 
 import backend.base;
 import helpers;

src/neat/hashmap.nt

@@ -1,7 +1,7 @@
 module neat.hashmap;
 
-macro import neat.macros.once;
-macro import neat.macros.quasiquoting;
+macro import std.macro.once;
+macro import std.macro.quasiquoting;
 
 import backend.base;
 import neat.array;

src/neat/packages.nt

@@ -1,7 +1,7 @@
 module neat.packages;
 
-macro import neat.macros.assert;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.listcomprehension;
 
 import helpers;
 import neat.base;

src/neat/statements.nt

@@ -1,6 +1,6 @@
 module neat.statements;
 
-macro import neat.macros.once;
+macro import std.macro.once;
 
 import backend.base;
 import helpers;

src/neat/struct_.nt

@@ -1,6 +1,6 @@
 module neat.struct_;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import backend.base;
 import helpers;

src/neat/stuff.nt

@@ -3,10 +3,10 @@ module neat.stuff;
 
 // IMPORTANT
 // Never import this module in macros! It's too big!
-macro import neat.macros.hash;
-macro import neat.macros.listcomprehension;
-macro import neat.macros.once;
-macro import neat.macros.quasiquoting;
+macro import std.macro.hash;
+macro import std.macro.listcomprehension;
+macro import std.macro.once;
+macro import std.macro.quasiquoting;
 
 import backend.base;
 import helpers;

src/neat/templ.nt

@@ -1,6 +1,6 @@
 module neat.templ;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import neat.base;
 import neat.class_;

src/neat/traits.nt

@@ -1,7 +1,7 @@
 // Very, very similar to neat.pragma. (Copypaste, why can't I quit you)
 module neat.traits;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import helpers;
 import neat.base;

src/neat/tuples.nt

@@ -1,7 +1,7 @@
 module neat.tuples;
 
-macro import neat.macros.listcomprehension;
-macro import neat.macros.quasiquoting;
+macro import std.macro.listcomprehension;
+macro import std.macro.quasiquoting;
 
 import backend.base;
 import helpers;

src/neat/vectors.nt

@@ -1,6 +1,6 @@
 module neat.vectors;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import backend.base;
 import helpers;

src/neat/workpool.nt

@@ -1,6 +1,6 @@
 module neat.workpool;
 
-macro import neat.macros.listcomprehension;
+macro import std.macro.listcomprehension;
 
 import neat.base;
 import neat.runtime : assert;

src/std/algorithm.nt

@@ -1,7 +1,7 @@
 module std.algorithm;
 
-macro import neat.macros.assert;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.listcomprehension;
 
 /**
  * Maps a range onto a lambda.

src/std/file.nt

@@ -1,7 +1,7 @@
 module std.file;
 
-macro import neat.macros.assert;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.listcomprehension;
 
 import std.string : cToString, cToStringFree, toStringz;
 

src/std/json.nt

@@ -1,12 +1,10 @@
 module std.json;
 
-macro import neat.macros.assert;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.listcomprehension;
 
-version (firstpass) { alias ParserImpl = Parser; }
-else { import package(compiler).neat.base; }
+import package(compiler).neat.base;
 import package(compiler).neat.parser;
-
 import std.string;
 
 /**

src/std/json/macro.nt

@@ -1,10 +1,9 @@
 module std.json.macro;
 
-macro import neat.macros.assert;
-macro import neat.macros.listcomprehension;
+macro import std.macro.assert;
+macro import std.macro.listcomprehension;
 
 import package(compiler).neat.base;
-import package(compiler).neat.parser_base;
 import package(compiler).neat.parser;
 
 import std.json;
@@ -23,12 +22,12 @@ class JsonSyntax : Macro
     {
         auto loc = parser.loc();
         parser.begin;
-        if (!acceptIdentifier(parser, "JSONValue")? || !parser.accept("(")?)
+        if (!parser.acceptIdentifier("JSONValue")? || !parser.accept("(")?)
         {
             parser.revert;
             return null;
         }
-        auto json = jsonParseImpl(parser)?;
+        auto json = jsonParseImpl(parser.instanceOf(ParserImpl).notNull)?;
         parser.expect(")")?;
         parser.commit;
         return quoteJson(lexicalContext.compiler, json);