@the_dissidents/libemmm 0.0.1 → 0.0.2

package/dist/index.mjs

@@ -113,6 +113,7 @@ var messages_exports = {};
 __export(messages_exports, {
   ArgumentCountMismatchMessage: () => ArgumentCountMismatchMessage,
   CannotExpandArgumentMessage: () => CannotExpandArgumentMessage,
+  CannotPopNotationMessage: () => CannotPopNotationMessage,
   ContentShouldBeOnNewlineMessage: () => ContentShouldBeOnNewlineMessage,
   ExpectedMessage: () => ExpectedMessage,
   InlineDefinitonInvalidEntityMessage: () => InlineDefinitonInvalidEntityMessage,
@@ -197,7 +198,7 @@ var ExpectedMessage = class {
   code = 1;
   severity = 2 /* Error */;
   get length() {
-    return this.what.length;
+    return 0;
   }
   get info() {
     return `expected '${this.what}'`;
@@ -207,13 +208,16 @@ var ExpectedMessage = class {
   }
 };
 var UnknownModifierMessage = class {
-  constructor(position, length) {
+  constructor(position, length, what) {
     this.position = position;
     this.length = length;
+    this.what = what;
   }
   code = 2;
   severity = 2 /* Error */;
-  info = `unknown modifier; did you forget to escape it?`;
+  get info() {
+    return `unknown modifier '${this.what}'; did you forget to escape it?`;
+  }
   get fixes() {
     let [pos, len] = [this.position, this.length];
     return [{
@@ -321,7 +325,19 @@ var SlotUsedOutsideDefinitionMessage = class {
   severity = 2 /* Error */;
   fixes = [];
   get info() {
-    return `[.slot] used outside a block definition`;
+    return `slot used outside a definition`;
+  }
+};
+var CannotPopNotationMessage = class {
+  constructor(position, length) {
+    this.position = position;
+    this.length = length;
+  }
+  code = 10;
+  severity = 2 /* Error */;
+  fixes = [];
+  get info() {
+    return `cannot pop notation`;
   }
 };
 var UnnecessaryNewlineMessage = class extends RemoveThingMessage {
@@ -390,12 +406,23 @@ var UndefinedVariableMessage = class {
 };
 
 // src/util.ts
-var NameManager = class {
+var NameManager = class _NameManager {
   array = [];
-  data;
+  data = /* @__PURE__ */ new Map();
   constructor(from) {
-    this.array = [...from?.array ?? []];
-    this.data = new Map(from?.data);
+    if (from === void 0) return;
+    if (from instanceof _NameManager) {
+      this.array = [...from.array];
+      this.data = new Map(from.data);
+    } else {
+      assert(Array.isArray(from));
+      this.array = from.map((x) => ({ k: x.name, v: x }));
+      this.array.sort((a, b) => b.k.length - a.k.length);
+      this.data = new Map(from.map((x) => [x.name, x]));
+    }
+  }
+  toArray() {
+    return this.array.map(({ v }) => v);
   }
   get(name) {
     return this.data.get(name);
@@ -957,12 +984,15 @@ var Parser = class {
     const result = this.#defs(type).find((x) => this.scanner.accept(x.name));
     const mod = result ?? UnknownModifier[type];
     if (result === void 0) {
-      const args2 = this.scanner.acceptUntil(MODIFIER_CLOSE_SIGN);
-      if (args2 === null) this.emit.message(
-        new ExpectedMessage(this.scanner.position(), MODIFIER_CLOSE_SIGN)
-      );
+      let name = "";
+      while (!this.scanner.isEOF() && !this.scanner.acceptWhitespaceChar() && !this.scanner.peek(MODIFIER_CLOSE_SIGN) && !this.scanner.peek(MODIFIER_END_SIGN)) {
+        if (this.scanner.accept("\\")) {
+          if (this.scanner.isEOF()) break;
+        }
+        name += this.scanner.acceptChar();
+      }
       this.emit.message(
-        new UnknownModifierMessage(posStart, this.scanner.position() - posStart)
+        new UnknownModifierMessage(posStart, this.scanner.position() - posStart, name)
       );
     }
     const args = this.ARGUMENTS();
@@ -1020,6 +1050,8 @@ var Parser = class {
       }
       this.emit.endBlock();
     }
+    const last = node.content.at(-1);
+    node.actualEnd = last?.actualEnd ?? last?.end;
     if (node.mod.delayContentExpansion) this.delayDepth--;
     if (node.mod.afterParseContent)
       this.emit.message(...node.mod.afterParseContent(node, this.cxt, immediate));
@@ -1102,6 +1134,8 @@ var Parser = class {
     while (!this.scanner.isEOF() && this.INLINE_ENTITY()) {
     }
     this.emit.endInline();
+    const last = node.content.at(-1);
+    node.actualEnd = last?.actualEnd ?? last?.end;
     debug.trace("PARSE para end");
   }
   // returns false if breaking out of paragraph
@@ -1191,11 +1225,12 @@ var Parser = class {
         content.push({
           type: 4 /* Escaped */,
           content: this.scanner.acceptChar(),
-          start: posEnd - 2,
-          end: posEnd
+          start: posEnd - 1,
+          end: posEnd + 1
         });
         continue;
       }
+      const beforeInterp = this.scanner.position();
       const result = this.cxt.config.argumentInterpolators.find(
         (x) => this.scanner.accept(x.name)
       );
@@ -1206,7 +1241,7 @@ var Parser = class {
           type: 8 /* Interpolation */,
           definition: result,
           argument: inner,
-          start: posEnd - 2,
+          start: beforeInterp,
           end: posEnd
         });
         if (!ok2) {
@@ -1268,7 +1303,8 @@ function initParseContext(cxt) {
     blockSlotDelayedStack: [],
     inlineSlotDelayedStack: [],
     blockSlotData: [],
-    inlineSlotData: []
+    inlineSlotData: [],
+    notationStack: []
   });
 }
 function customModifier(type, name, argNames, slotName, content) {
@@ -1496,6 +1532,41 @@ var DefineInlineMod = new SystemModifierDefinition("define-inline", 0 /* Normal
   }
 });
 
+// src/builtin/pushpop.ts
+var PushNotationMod = new SystemModifierDefinition(
+  "push-notation",
+  2 /* Marker */,
+  {
+    expand(_, cxt) {
+      const data = cxt.get(builtins);
+      data.notationStack.push({
+        blocks: cxt.config.blockModifiers.toArray(),
+        inlines: cxt.config.inlineModifiers.toArray()
+      });
+      return [];
+    }
+  }
+);
+var PopNotationMod = new SystemModifierDefinition(
+  "pop-notation",
+  2 /* Marker */,
+  {
+    prepareExpand(node, cxt) {
+      const data = cxt.get(builtins);
+      const result = data.notationStack.pop();
+      if (!result) return [
+        new CannotPopNotationMessage(node.start, node.end - node.start)
+      ];
+      cxt.config.blockModifiers = new NameManager(result.blocks);
+      cxt.config.inlineModifiers = new NameManager(result.inlines);
+      return [];
+    },
+    expand() {
+      return [];
+    }
+  }
+);
+
 // src/builtin/slot.ts
 function slotModifier(type) {
   const mod = type == 7 /* BlockModifier */ ? new BlockModifierDefinition("slot", 2 /* Marker */) : new InlineModifierDefinition("slot", 2 /* Marker */);
@@ -1610,6 +1681,19 @@ var GetVarInlineMod = new InlineModifierDefinition("$", 2 /* Marker */, {
     return [{ type: 3 /* Text */, content: node.state.value, start: -1, end: -1 }];
   }
 });
+var PrintInlineMod = new InlineModifierDefinition("print", 2 /* Marker */, {
+  // .print:args...
+  prepareExpand(node) {
+    const check = checkArguments(node);
+    if (check) return check;
+    node.state = { value: node.arguments.map((x) => x.expansion).join("") };
+    return [];
+  },
+  expand(node) {
+    if (!node.state) return [];
+    return [{ type: 3 /* Text */, content: node.state.value, start: -1, end: -1 }];
+  }
+});
 var GetVarInterpolator = new ArgumentInterpolatorDefinition(
   "$(",
   ")",
@@ -1650,9 +1734,9 @@ var VarMod = new SystemModifierDefinition("var", 2 /* Marker */, {
 // src/builtin/builtin.ts
 var basic = new Configuration();
 basic.initializers = [initParseContext];
-basic.systemModifiers.add(DefineBlockMod, DefineInlineMod, VarMod);
+basic.systemModifiers.add(DefineBlockMod, DefineInlineMod, VarMod, PushNotationMod, PopNotationMod);
 basic.blockModifiers.add(SlotBlockMod);
-basic.inlineModifiers.add(SlotInlineMod, GetVarInlineMod);
+basic.inlineModifiers.add(SlotInlineMod, GetVarInlineMod, PrintInlineMod);
 basic.argumentInterpolators.add(GetVarInterpolator);
 var BuiltinConfiguration = Object.freeze(basic);