eyelang 1.2.1 → 1.2.2

package/docs/guide.md

@@ -451,7 +451,7 @@ Use `holds/2` when you want to match the member term directly, for example `name
 | [`turing.pl`](../examples/turing.pl) | Simulates a binary-increment Turing machine. | [`output/turing.pl`](../examples/output/turing.pl) |
 | [`vector-similarity.pl`](../examples/vector-similarity.pl) | Computes dot product, norm, and cosine similarity. | [`output/vector-similarity.pl`](../examples/output/vector-similarity.pl) |
 | [`vulnerability-impact.pl`](../examples/vulnerability-impact.pl) | Analyzes vulnerable transitive dependencies and urgent patch impact. | [`output/vulnerability-impact.pl`](../examples/output/vulnerability-impact.pl) |
-| [`web-names.pl`](../examples/web-names.pl) | Uses compact `web(Space, Local)` terms as readable global names and expands selected names to URIs. | [`output/web-names.pl`](../examples/output/web-names.pl) |
+| [`web-names.pl`](../examples/web-names.pl) | Uses compact ISO-compatible `web(Space, Local)` terms as readable global identifiers and expands selected terms to URIs. | [`output/web-names.pl`](../examples/output/web-names.pl) |
 | [`weighted-interval-scheduling.pl`](../examples/weighted-interval-scheduling.pl) | Selects the best non-overlapping weighted intervals with memoized dynamic programming. | [`output/weighted-interval-scheduling.pl`](../examples/output/weighted-interval-scheduling.pl) |
 | [`witch.pl`](../examples/witch.pl) | Derives the classic “burn the witch” rule chain. | [`output/witch.pl`](../examples/output/witch.pl) |
 | [`wolf-goat-cabbage.pl`](../examples/wolf-goat-cabbage.pl) | Solves the wolf-goat-cabbage river crossing. | [`output/wolf-goat-cabbage.pl`](../examples/output/wolf-goat-cabbage.pl) |

package/docs/language-reference.md

@@ -119,7 +119,7 @@ The punctuation tokens are:
 (  )  [  ]  ,  |  .  :-
 ```
 
-A colon outside `:-` is not part of the language. Namespace-like names SHOULD be written as plain atom constants such as `person_type`, `odrl_permission`, or dotted atom constants such as `org.schema`.
+A colon outside `:-` is not part of the language. Namespace-like names SHOULD be written as ISO-compatible atom constants such as `person_type`, `odrl_permission`, or quoted atoms such as `'org.schema'`.
 
 ### 3.4 Variables
 
@@ -138,15 +138,15 @@ Each `_` anonymous variable occurrence is fresh.
 
 ### 3.5 Atom constants
 
-A plain atom constant starts with a lowercase ASCII letter and is followed by zero or more ASCII letters, digits, or underscores. For compact globally scoped names, eyelang also permits dot-separated plain atom segments, such as `be.ugent`, `org.schema`, or `eyereasoner.github`. A dot ends a clause only when it is not followed by another lowercase-starting segment. Names such as `a-b` or `http://example` MUST still be quoted if they are meant as one atom constant:
+A plain atom constant starts with a lowercase ASCII letter and is followed by zero or more ASCII letters, digits, or underscores. A dot is not part of a plain atom in the ISO-compatible subset; dotted web spaces such as `'be.ugent'` or `'org.schema'` MUST be quoted if they are meant as one atom constant. Names such as `a-b` or `http://example` MUST also be quoted if they are meant as one atom constant:
 
 ```prolog
 pat
 type
 case_123
-be.ugent
-org.schema
-eyereasoner.github
+'be.ugent'
+'org.schema'
+'eyereasoner.github'
 'a-b'
 'http://example'
 ```

package/examples/output/web-names.pl

@@ -1,10 +1,10 @@
-web_uri(web(be.ugent, josd), "https://data.ugent.be/id/josd").
-web_uri(web(com.example, josd), "https://example.com/id/josd").
-web_uri(web(be.ugent, idlab), "https://data.ugent.be/id/idlab").
-web_uri(web(be.ugent, ugent), "https://data.ugent.be/id/ugent").
-web_uri(web(eyereasoner.github, eyelang), "https://github.com/eyereasoner/eyelang").
-web_uri(web(org.schema, maintainer), "https://schema.org/maintainer").
-affiliated_with(web(be.ugent, josd), web(be.ugent, idlab)).
-affiliated_with(web(be.ugent, josd), web(be.ugent, ugent)).
-project_contact(web(eyereasoner.github, eyelang), web(be.ugent, josd), "josderoo@gmail.com").
-same_local_name(web(be.ugent, josd), web(com.example, josd), josd).
+web_uri(web('be.ugent', josd), "https://data.ugent.be/id/josd").
+web_uri(web('com.example', josd), "https://example.com/id/josd").
+web_uri(web('be.ugent', idlab), "https://data.ugent.be/id/idlab").
+web_uri(web('be.ugent', ugent), "https://data.ugent.be/id/ugent").
+web_uri(web('eyereasoner.github', eyelang), "https://github.com/eyereasoner/eyelang").
+web_uri(web('org.schema', maintainer), "https://schema.org/maintainer").
+affiliated_with(web('be.ugent', josd), web('be.ugent', idlab)).
+affiliated_with(web('be.ugent', josd), web('be.ugent', ugent)).
+project_contact(web('eyereasoner.github', eyelang), web('be.ugent', josd), "josderoo@gmail.com").
+same_local_name(web('be.ugent', josd), web('com.example', josd), josd).

package/examples/web-names.pl

@@ -2,13 +2,13 @@
 %
 % RDF-style URIs are globally meaningful but long, while QNames such as
 % schema:Person depend on an external prefix declaration.  This example uses an
-% eyelang-native alternative: web(Space, Local).  The first argument is a dotted
-% atom that names a vocabulary, organization, or authority; the second argument
-% is the local name inside that space.
+% eyelang-native alternative: web(Space, Local).  The first argument is an
+% ISO-compatible quoted atom naming a vocabulary, organization, or authority;
+% the second argument is the local name inside that space.
 %
 % The important property is that the complete term is self-contained.  The local
-% name josd can safely occur in two spaces: web(be.ugent, josd) and
-% web(com.example, josd) are different Herbrand terms, so there is no hidden
+% name josd can safely occur in two spaces: web('be.ugent', josd) and
+% web('com.example', josd) are different Herbrand terms, so there is no hidden
 % prefix context and no accidental collision.  Tooling can still expand selected
 % web/2 terms to full URI strings when a base is known.
 
@@ -18,32 +18,32 @@ materialize(project_contact, 3).
 materialize(same_local_name, 3).
 
 % Optional URI bases for spaces that we want to publish or display.
-space_base(be.ugent, "https://data.ugent.be/id/").
-space_base(com.example, "https://example.com/id/").
-space_base(eyereasoner.github, "https://github.com/eyereasoner/").
-space_base(org.schema, "https://schema.org/").
+space_base('be.ugent', "https://data.ugent.be/id/").
+space_base('com.example', "https://example.com/id/").
+space_base('eyereasoner.github', "https://github.com/eyereasoner/").
+space_base('org.schema', "https://schema.org/").
 
-% A tiny graph using globally scoped web names as ordinary eyelang terms.
-triple(web(be.ugent, josd), web(org.schema, name), "Jos De Roo").
-triple(web(be.ugent, josd), web(org.schema, email), "josderoo@gmail.com").
-triple(web(be.ugent, josd), web(org.schema, affiliation), web(be.ugent, idlab)).
-triple(web(be.ugent, idlab), web(org.schema, parentOrganization), web(be.ugent, ugent)).
+% A tiny graph using globally scoped web terms as ordinary eyelang terms.
+triple(web('be.ugent', josd), web('org.schema', name), "Jos De Roo").
+triple(web('be.ugent', josd), web('org.schema', email), "josderoo@gmail.com").
+triple(web('be.ugent', josd), web('org.schema', affiliation), web('be.ugent', idlab)).
+triple(web('be.ugent', idlab), web('org.schema', parentOrganization), web('be.ugent', ugent)).
 
-triple(web(eyereasoner.github, eyelang), web(org.schema, name), "eyelang").
-triple(web(eyereasoner.github, eyelang), web(org.schema, codeRepository), "https://github.com/eyereasoner/eyelang").
-triple(web(eyereasoner.github, eyelang), web(org.schema, maintainer), web(be.ugent, josd)).
+triple(web('eyereasoner.github', eyelang), web('org.schema', name), "eyelang").
+triple(web('eyereasoner.github', eyelang), web('org.schema', codeRepository), "https://github.com/eyereasoner/eyelang").
+triple(web('eyereasoner.github', eyelang), web('org.schema', maintainer), web('be.ugent', josd)).
 
 % Same local spelling, different global identity.
-triple(web(com.example, josd), web(org.schema, name), "Another JosD in another space").
+triple(web('com.example', josd), web('org.schema', name), "Another JosD in another space").
 
 % Keep URI expansion explicit and optional: reasoning uses web/2 terms, while
 % web_uri/2 is only a presentation bridge for selected names.
-published_name(web(be.ugent, josd)).
-published_name(web(com.example, josd)).
-published_name(web(be.ugent, idlab)).
-published_name(web(be.ugent, ugent)).
-published_name(web(eyereasoner.github, eyelang)).
-published_name(web(org.schema, maintainer)).
+published_name(web('be.ugent', josd)).
+published_name(web('com.example', josd)).
+published_name(web('be.ugent', idlab)).
+published_name(web('be.ugent', ugent)).
+published_name(web('eyereasoner.github', eyelang)).
+published_name(web('org.schema', maintainer)).
 
 web_uri(web(Space, Local), URI) :-
     published_name(web(Space, Local)),
@@ -53,28 +53,28 @@ web_uri(web(Space, Local), URI) :-
 
 % Organization membership follows parentOrganization links transitively.
 parent_organization(Unit, Org) :-
-    triple(Unit, web(org.schema, parentOrganization), Org).
+    triple(Unit, web('org.schema', parentOrganization), Org).
 parent_organization(Unit, Org) :-
-    triple(Unit, web(org.schema, parentOrganization), Mid),
+    triple(Unit, web('org.schema', parentOrganization), Mid),
     parent_organization(Mid, Org).
 
 affiliated_with(Person, Org) :-
-    triple(Person, web(org.schema, affiliation), Org).
+    triple(Person, web('org.schema', affiliation), Org).
 affiliated_with(Person, Org) :-
-    triple(Person, web(org.schema, affiliation), Unit),
+    triple(Person, web('org.schema', affiliation), Unit),
     parent_organization(Unit, Org).
 
 % A project contact is derived by joining the project's maintainer with the
 % maintainer's email.  The join works because both facts use the same complete
-% web(be.ugent, josd) term.
+% web('be.ugent', josd) term.
 project_contact(Project, Person, Email) :-
-    triple(Project, web(org.schema, maintainer), Person),
-    triple(Person, web(org.schema, email), Email).
+    triple(Project, web('org.schema', maintainer), Person),
+    triple(Person, web('org.schema', email), Email).
 
 % Demonstrate that local names are not global names.  This reports the deliberate
 % local-name collision without treating the two people as equal.
 local_name(Entity, Local) :-
-    triple(Entity, web(org.schema, name), _),
+    triple(Entity, web('org.schema', name), _),
     eq(Entity, web(_, Local)).
 
 same_local_name(A, B, Local) :-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyelang",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A small Prolog-syntax-subset logic programming language for rules, goals, answers, and proofs.",
   "type": "module",
   "main": "./index.js",

package/src/parser.js

@@ -23,9 +23,6 @@ function isNameContinueCode(code) {
   return code === 95 || isAsciiLetterCode(code) || isDigitCode(code);
 }
 
-function isDottedAtomContinue(source, pos) {
-  return source[pos] === '.' && isPlainAtomStartCode((source[pos + 1] ?? '').charCodeAt(0));
-}
 
 function isVariableStart(text) {
   const code = text.charCodeAt(0);
@@ -155,18 +152,7 @@ class Parser {
     if (isPlainAtomStartCode(ch.charCodeAt(0))) {
       const start = this.pos;
       this.take();
-      while (true) {
-        if (isNameContinueCode(this.peek().charCodeAt(0))) {
-          this.take();
-          continue;
-        }
-        if (isDottedAtomContinue(this.source, this.pos)) {
-          this.take();
-          this.take();
-          continue;
-        }
-        break;
-      }
+      while (isNameContinueCode(this.peek().charCodeAt(0))) this.take();
       return { type: TOK.ATOM, text: this.source.slice(start, this.pos), line };
     }
 
@@ -331,7 +317,7 @@ const SIMPLE_NUMBER = /^-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?$/;
 const FAST_BINARY_FACT = /^([a-z][A-Za-z0-9_]*)\(\s*([^,\s()[\]|"']+)\s*,\s*([^,\s()[\]|"']+)\s*\)\.$/;
 const FAST_BINARY_RULE = /^([a-z][A-Za-z0-9_]*)\(\s*([^,\s()[\]|"']+)\s*,\s*([^,\s()[\]|"']+)\s*\)\s*:-\s*([a-z][A-Za-z0-9_]*)\(\s*([^,\s()[\]|"']+)\s*,\s*([^,\s()[\]|"']+)\s*\)\.$/;
 const SIMPLE_VARIABLE = /^[_A-Z][A-Za-z0-9_]*$/;
-const SIMPLE_ATOM = /^[a-z][A-Za-z0-9_]*(?:\.[a-z][A-Za-z0-9_]*)*$/;
+const SIMPLE_ATOM = /^[a-z][A-Za-z0-9_]*$/;
 const GRAPHIC_ATOM = /^[#$&*+\-\/<=>?@^~\\]+$/;
 
 function parseClausesFastNoSource(source) {

package/src/term.js

@@ -138,7 +138,7 @@ const graphicAtomChars = new Set('#$&*+-/<=>?@^~\\'.split(''));
 function atomNeedsQuotes(name) {
   if (!name) return true;
   if (name === '[]') return false;
-  if (/^[a-z][A-Za-z0-9_]*(?:\.[a-z][A-Za-z0-9_]*)*$/.test(name)) return false;
+  if (/^[a-z][A-Za-z0-9_]*$/.test(name)) return false;
   for (const ch of name) if (!graphicAtomChars.has(ch)) return true;
   return false;
 }

package/test/run-regression.mjs

@@ -477,10 +477,18 @@ function whiteBoxCases() {
       },
     },
     {
-      name: 'parser preserves dotted atom constants for web-style terms',
+      name: 'parser rejects unquoted dotted atoms to stay ISO-compatible',
       run: () => {
-        const clauses = parseProgramText('p(web(be.ugent, josd), org.schema).\n');
-        assertEqual(termToString(clauses[0].head, new Env(), true), 'p(web(be.ugent, josd), org.schema)', 'head');
+        let threw = false;
+        try { parseProgramText('p(web(be.ugent, josd)).\n'); } catch (_) { threw = true; }
+        assertEqual(threw, true, 'unquoted dotted atoms must be quoted');
+      },
+    },
+    {
+      name: 'parser preserves quoted dotted atoms for web-style terms',
+      run: () => {
+        const clauses = parseProgramText("p(web('be.ugent', josd), 'org.schema').\n");
+        assertEqual(termToString(clauses[0].head, new Env(), true), "p(web('be.ugent', josd), 'org.schema')", 'head');
       },
     },
     {