eyelang 1.7.10 → 1.7.11

package/docs/language-reference.md

@@ -123,7 +123,7 @@ A colon outside `:-` is not part of the language. Namespace-like names SHOULD be
 
 ### 3.4 Variables
 
-A variable starts with `?` followed by an ASCII letter or underscore and then zero or more ASCII letters, digits, or underscores. This N3/SPARQL-style spelling is the only source-level variable spelling in eyelang.
+A variable is either the bare anonymous variable `?`, or starts with `?` followed by an ASCII letter or underscore and then zero or more ASCII letters, digits, or underscores. This N3/SPARQL-style spelling is the only source-level variable spelling in eyelang.
 
 Examples:
 
@@ -131,10 +131,10 @@ Examples:
 ?x
 ?person
 ?_thing
-?_
+?
 ```
 
-Each `?_` anonymous variable occurrence is fresh. A bare `_` is not a variable in eyelang source.
+Each bare `?` anonymous variable occurrence is fresh. A bare `_` is not a variable in eyelang source.
 
 ### 3.5 Atom constants
 
@@ -171,7 +171,7 @@ A quoted atom constant is enclosed in single quotes. A single quote inside a quo
 A graphic atom constant is one or more graphic characters from this set:
 
 ```text
-#$&*+-/<=>?@^~\
+#$&*+-/<=>@^~\
 ```
 
 Angle-bracket IRI syntax is recognized only for absolute IRI-like contents. Graphic atoms such as `<=>`, `<`, and `>=` remain graphic atoms.

package/examples/animal.eye

@@ -18,4 +18,4 @@ animal(?x) :- human(?x).
 type(joe, human) :- human(joe).
 type(joe, animal) :- animal(joe).
 subclassOf(human, animal) :- animal(human).
-succeeds(animalExample, true) :- animal(?_).
+succeeds(animalExample, true) :- animal(?).

package/examples/dairy-energy-balance.eye

@@ -17,15 +17,15 @@ cow(grazing, 540, 18, 5.8, 21).
 
 % Maintenance scales with body weight; milk requirement scales with daily milk.
 maintenance(?c, ?m) :-
-  cow(?c, ?weight, ?_, ?_, ?_),
+  cow(?c, ?weight, ?, ?, ?),
   mul(?weight, 0.08, ?m).
 
 milk_requirement(?c, ?r) :-
-  cow(?c, ?_, ?milk, ?_, ?_),
+  cow(?c, ?, ?milk, ?, ?),
   mul(?milk, 5.0, ?r).
 
 ration_supply(?c, ?s) :-
-  cow(?c, ?_, ?_, ?density, ?intake),
+  cow(?c, ?, ?, ?density, ?intake),
   mul(?density, ?intake, ?s).
 
 total_requirement(?c, ?r) :-

package/examples/dijkstra-risk-path.eye

@@ -41,7 +41,7 @@ candidate(pathRelay, [depotA, relay, labD]).
 candidate(pathDirectC, [depotA, labD]).
 candidate(pathViaC, [depotA, depotC, depotB, labD]).
 
-route_cost([?_], 0.0, 0.0, 0).
+route_cost([?], 0.0, 0.0, 0).
 route_cost([?from, ?to|?rest], ?raw, ?risk, ?edges) :-
   route_segment(?from, ?to, ?stepraw, ?steprisk),
   route_cost([?to|?rest], ?restraw, ?restrisk, ?restedges),

package/examples/ev-range-worlds.eye

@@ -24,18 +24,18 @@ trip_data(cold_commute, 120, 90, -8, 100, 35, 0.19).
 
 % Each world adds a different combination of speed, temperature, payload, and
 % reserve factors before comparing required energy with usable battery.
-speed_factor(?t, 1.20) :- trip_data(?t, ?_, ?s, ?_, ?_, ?_, ?_), gt(?s, 100).
-speed_factor(?t, 1.00) :- trip_data(?t, ?_, ?s, ?_, ?_, ?_, ?_), le(?s, 100).
+speed_factor(?t, 1.20) :- trip_data(?t, ?, ?s, ?, ?, ?, ?), gt(?s, 100).
+speed_factor(?t, 1.00) :- trip_data(?t, ?, ?s, ?, ?, ?, ?), le(?s, 100).
 
-temperature_factor(?t, 1.15) :- trip_data(?t, ?_, ?_, ?temp, ?_, ?_, ?_), lt(?temp, 0).
-temperature_factor(?t, 1.00) :- trip_data(?t, ?_, ?_, ?temp, ?_, ?_, ?_), ge(?temp, 0).
+temperature_factor(?t, 1.15) :- trip_data(?t, ?, ?, ?temp, ?, ?, ?), lt(?temp, 0).
+temperature_factor(?t, 1.00) :- trip_data(?t, ?, ?, ?temp, ?, ?, ?), ge(?temp, 0).
 
-payload_factor(?t, 1.15) :- trip_data(?t, ?_, ?_, ?_, ?p, ?_, ?_), gt(?p, 500).
-payload_factor(?t, 1.08) :- trip_data(?t, ?_, ?_, ?_, ?p, ?_, ?_), gt(?p, 250), le(?p, 500).
-payload_factor(?t, 1.00) :- trip_data(?t, ?_, ?_, ?_, ?p, ?_, ?_), le(?p, 250).
+payload_factor(?t, 1.15) :- trip_data(?t, ?, ?, ?, ?p, ?, ?), gt(?p, 500).
+payload_factor(?t, 1.08) :- trip_data(?t, ?, ?, ?, ?p, ?, ?), gt(?p, 250), le(?p, 500).
+payload_factor(?t, 1.00) :- trip_data(?t, ?, ?, ?, ?p, ?, ?), le(?p, 250).
 
 base_energy(?t, ?e) :-
-  trip_data(?t, ?d, ?_, ?_, ?_, ?_, ?b),
+  trip_data(?t, ?d, ?, ?, ?, ?, ?b),
   mul(?d, ?b, ?e).
 
 required_energy(?t, w1, ?e) :-
@@ -61,12 +61,12 @@ required_energy(?t, w3, ?e) :-
 
 % safe_in_world/2 compares required trip energy with usable battery capacity.
 safe_in_world(?t, ?w) :-
-  trip_data(?t, ?_, ?_, ?_, ?_, ?battery, ?_),
+  trip_data(?t, ?, ?, ?, ?, ?battery, ?),
   required_energy(?t, ?w, ?required),
   le(?required, ?battery).
 
 risky_in_world(?t, ?w) :-
-  trip_data(?t, ?_, ?_, ?_, ?_, ?battery, ?_),
+  trip_data(?t, ?, ?, ?, ?, ?battery, ?),
   required_energy(?t, ?w, ?required),
   gt(?required, ?battery).
 

package/examples/fft8-numeric.eye

@@ -82,4 +82,4 @@ fft(?wave, ?spectrum) :-
 
 dcComponent(?wave, ?dc) :-
   wave(?wave, ?samples),
-  fft8(?samples, [?dc|?_]).
+  fft8(?samples, [?dc|?]).

package/examples/field-nitrogen-balance.eye

@@ -21,41 +21,41 @@ field(clay_surplus, 70, 90, 0.08, 120).
 % total_n/2 and available_n/2 build the nutrient budget; surplus/deficit and
 % leaching rules then explain the resulting field status.
 total_n(?f, ?total) :-
-  field(?f, ?soil, ?fert, ?_, ?_),
+  field(?f, ?soil, ?fert, ?, ?),
   add(?soil, ?fert, ?total).
 
 available_n(?f, ?avail) :-
   total_n(?f, ?total),
-  field(?f, ?_, ?_, ?loss, ?_),
+  field(?f, ?, ?, ?loss, ?),
   sub(1.0, ?loss, ?retained),
   mul(?total, ?retained, ?avail).
 
 % surplus_n/2 and deficit_n/2 split the signed balance into reportable quantities.
 surplus_n(?f, ?surplus) :-
   available_n(?f, ?avail),
-  field(?f, ?_, ?_, ?_, ?demand),
+  field(?f, ?, ?, ?, ?demand),
   gt(?avail, ?demand),
   sub(?avail, ?demand, ?surplus).
 
 surplus_n(?f, 0.0) :-
   available_n(?f, ?avail),
-  field(?f, ?_, ?_, ?_, ?demand),
+  field(?f, ?, ?, ?, ?demand),
   le(?avail, ?demand).
 
 deficit_n(?f, ?deficit) :-
   available_n(?f, ?avail),
-  field(?f, ?_, ?_, ?_, ?demand),
+  field(?f, ?, ?, ?, ?demand),
   lt(?avail, ?demand),
   sub(?demand, ?avail, ?deficit).
 
 deficit_n(?f, 0.0) :-
   available_n(?f, ?avail),
-  field(?f, ?_, ?_, ?_, ?demand),
+  field(?f, ?, ?, ?, ?demand),
   ge(?avail, ?demand).
 
 leaching_index(?f, ?index) :-
   surplus_n(?f, ?surplus),
-  field(?f, ?_, ?_, ?loss, ?_),
+  field(?f, ?, ?, ?loss, ?),
   mul(?surplus, ?loss, ?index).
 
 status(?f, under_supplied) :- deficit_n(?f, ?d), gt(?d, 10.0).

package/examples/fundamental-theorem-arithmetic.eye

@@ -112,8 +112,8 @@ distinctPrimeCount(case, 4) :-
 
 smallestPrimeFactor(case, 3) :-
   case(fta, ?n),
-  factor_smallest(?n, [3|?_]).
+  factor_smallest(?n, [3|?]).
 
 largestPrimeFactor(case, 3881) :-
   case(fta, ?n),
-  factor_largest(?n, [3881|?_]).
+  factor_largest(?n, [3881|?]).

package/examples/gps.eye

@@ -78,24 +78,24 @@ outcome(routeDirect, "Take the direct route via Brugge.").
 
 % Verification checks, analogous to the false-producing guards in gps.n3.
 check(c1, true) :-
-  traveller_path(i1, [drive_gent_brugge, drive_brugge_oostende], ?_, ?_, ?_, ?_).
+  traveller_path(i1, [drive_gent_brugge, drive_brugge_oostende], ?, ?, ?, ?).
 
 check(c2, true) :-
-  traveller_path(i1, [drive_gent_kortrijk, drive_kortrijk_brugge, drive_brugge_oostende], ?_, ?_, ?_, ?_).
+  traveller_path(i1, [drive_gent_kortrijk, drive_kortrijk_brugge, drive_brugge_oostende], ?, ?, ?, ?).
 
 check(c3, true) :-
-  route_metrics(routeDirect, ?d1, ?_, ?_, ?_),
-  route_metrics(routeViaKortrijk, ?d2, ?_, ?_, ?_),
+  route_metrics(routeDirect, ?d1, ?, ?, ?),
+  route_metrics(routeViaKortrijk, ?d2, ?, ?, ?),
   lt(?d1, ?d2).
 
 check(c4, true) :-
-  route_metrics(routeDirect, ?_, ?c1, ?_, ?_),
-  route_metrics(routeViaKortrijk, ?_, ?c2, ?_, ?_),
+  route_metrics(routeDirect, ?, ?c1, ?, ?),
+  route_metrics(routeViaKortrijk, ?, ?c2, ?, ?),
   lt(?c1, ?c2).
 
 check(c5, true) :-
-  route_metrics(routeDirect, ?_, ?_, ?b1, ?f1),
-  route_metrics(routeViaKortrijk, ?_, ?_, ?b2, ?f2),
+  route_metrics(routeDirect, ?, ?, ?b1, ?f1),
+  route_metrics(routeViaKortrijk, ?, ?, ?b2, ?f2),
   gt(?b1, ?b2),
   gt(?f1, ?f2).
 

package/examples/illegitimate-reasoning.eye

@@ -67,22 +67,22 @@ fallacy(?a, hasty_generalization) :-
   sample_size(?a, ?n),
   required_sample_size(?a, ?min),
   lt(?n, ?min),
-  concludes(?a, all(?_, ?_)).
+  concludes(?a, all(?, ?)).
 
 fallacy(?a, false_dilemma) :-
   argument(?a),
-  presented_alternatives(?a, ?_),
-  omitted_alternative(?a, ?_),
-  concludes(?a, ?_).
+  presented_alternatives(?a, ?),
+  omitted_alternative(?a, ?),
+  concludes(?a, ?).
 
 reason(arg_affirming_consequent, "observing the consequent does not prove the antecedent").
 reason(arg_denying_antecedent, "denying the antecedent does not disprove the consequent").
 reason(arg_hasty_generalization, "sample size is below the threshold for a universal conclusion").
 reason(arg_false_dilemma, "a relevant alternative is omitted").
 
-type(?a, illegitimate_reasoning) :- fallacy(?a, ?_).
-conclusion(?a, ?c) :- fallacy(?a, ?_), concludes(?a, ?c).
-reason(?a, ?r) :- fallacy(?a, ?_), reason(?a, ?r).
+type(?a, illegitimate_reasoning) :- fallacy(?a, ?).
+conclusion(?a, ?c) :- fallacy(?a, ?), concludes(?a, ?c).
+reason(?a, ?r) :- fallacy(?a, ?), reason(?a, ?r).
 sampleSize(?a, ?n) :- fallacy(?a, hasty_generalization), sample_size(?a, ?n).
 requiredSampleSize(?a, ?min) :- fallacy(?a, hasty_generalization), required_sample_size(?a, ?min).
 omittedAlternative(?a, ?alt) :- fallacy(?a, false_dilemma), omitted_alternative(?a, ?alt).

package/examples/map-four-color-search.eye

@@ -50,7 +50,7 @@ valid_color(?place, ?color, ?assigned) :-
   not((member([?neighbor, ?color], ?assigned), member(?neighbor, ?neighbors))).
 
 place_pairs([], []).
-place_pairs([?place|?rest], [[?place, ?_]|?pairs]) :-
+place_pairs([?place|?rest], [[?place, ?]|?pairs]) :-
   place_pairs(?rest, ?pairs).
 
 color_places([]).

package/examples/monkey-bananas.eye

@@ -19,9 +19,9 @@ plan(?moves) :-
   goal_state(?g),
   reachable(?i, ?moves, ?g).
 
-candidate_plan([?_, ?_, ?_]).
-candidate_plan([?_, ?_, ?_, ?_]).
-candidate_plan([?_, ?_, ?_, ?_, ?_]).
+candidate_plan([?, ?, ?]).
+candidate_plan([?, ?, ?, ?]).
+candidate_plan([?, ?, ?, ?, ?]).
 
 reachable(?s, [], ?s).
 reachable(?s1, [?m|?l], ?s3) :-
@@ -29,7 +29,7 @@ reachable(?s1, [?m|?l], ?s3) :-
   reachable(?s2, ?l, ?s3).
 
 initial_state([loc1, loc2, loc3, n, n]).
-goal_state([?_, ?_, ?_, ?_, y]).
+goal_state([?, ?, ?, ?, y]).
 
 legal_move([?b, ?m, ?m, n, ?h], climb_on, [?b, ?m, ?m, y, ?h]).
 legal_move([?b, ?m, ?m, y, ?h], climb_off, [?b, ?m, ?m, n, ?h]).

package/examples/wolf-goat-cabbage.eye

@@ -46,8 +46,8 @@ safe([?man, ?wolf, ?goat, ?cabbage]) :-
   one_eq(?man, ?goat, ?wolf),
   one_eq(?man, ?goat, ?cabbage).
 
-one_eq(?x, ?x, ?_).
-one_eq(?x, ?_, ?x).
+one_eq(?x, ?x, ?).
+one_eq(?x, ?, ?x).
 
 solution(puzzle, ?moves) :-
   solution(?moves).

package/examples/zebra.eye

@@ -12,33 +12,33 @@ materialize(solved, 2).
 
 % The single zebra/2 rule is a finite constraint model over the five house slots.
 zebra(?waterdrinker, ?zebraowner) :-
-  eq(?houses, [?_, ?_, ?_, ?_, ?_]),
-  first(?houses, house(?_, norwegian, ?_, ?_, ?_)),
-  third(?houses, house(?_, ?_, ?_, milk, ?_)),
-  adjacent(house(?_, norwegian, ?_, ?_, ?_), house(blue, ?_, ?_, ?_, ?_), ?houses),
-  next_to(house(ivory, ?_, ?_, ?_, ?_), house(green, ?_, ?_, ?_, ?_), ?houses),
-  member(house(red, english, ?_, ?_, ?_), ?houses),
-  member(house(green, ?_, ?_, coffee, ?_), ?houses),
-  member(house(yellow, ?_, ?_, ?_, kools), ?houses),
-  member(house(?_, spanish, dog, ?_, ?_), ?houses),
-  member(house(?_, ukrainian, ?_, tea, ?_), ?houses),
-  member(house(?_, ?_, snail, ?_, old_gold), ?houses),
-  adjacent(house(?_, ?_, ?_, ?_, chesterfields), house(?_, ?_, fox, ?_, ?_), ?houses),
-  adjacent(house(?_, ?_, ?_, ?_, kools), house(?_, ?_, horse, ?_, ?_), ?houses),
-  member(house(?_, ?_, ?_, orange_juice, lucky_strike), ?houses),
-  member(house(?_, japanese, ?_, ?_, parliaments), ?houses),
-  member(house(?_, ?waterdrinker, ?_, water, ?_), ?houses),
-  member(house(?_, ?zebraowner, zebra, ?_, ?_), ?houses).
+  eq(?houses, [?, ?, ?, ?, ?]),
+  first(?houses, house(?, norwegian, ?, ?, ?)),
+  third(?houses, house(?, ?, ?, milk, ?)),
+  adjacent(house(?, norwegian, ?, ?, ?), house(blue, ?, ?, ?, ?), ?houses),
+  next_to(house(ivory, ?, ?, ?, ?), house(green, ?, ?, ?, ?), ?houses),
+  member(house(red, english, ?, ?, ?), ?houses),
+  member(house(green, ?, ?, coffee, ?), ?houses),
+  member(house(yellow, ?, ?, ?, kools), ?houses),
+  member(house(?, spanish, dog, ?, ?), ?houses),
+  member(house(?, ukrainian, ?, tea, ?), ?houses),
+  member(house(?, ?, snail, ?, old_gold), ?houses),
+  adjacent(house(?, ?, ?, ?, chesterfields), house(?, ?, fox, ?, ?), ?houses),
+  adjacent(house(?, ?, ?, ?, kools), house(?, ?, horse, ?, ?), ?houses),
+  member(house(?, ?, ?, orange_juice, lucky_strike), ?houses),
+  member(house(?, japanese, ?, ?, parliaments), ?houses),
+  member(house(?, ?waterdrinker, ?, water, ?), ?houses),
+  member(house(?, ?zebraowner, zebra, ?, ?), ?houses).
 
 % Positional and neighborhood helpers keep the clue encoding readable.
-first([?x|?_], ?x).
-third([?_, ?_, ?x|?_], ?x).
+first([?x|?], ?x).
+third([?, ?, ?x|?], ?x).
 
 adjacent(?a, ?b, ?list) :- next_to(?a, ?b, ?list).
 adjacent(?a, ?b, ?list) :- next_to(?b, ?a, ?list).
 
-next_to(?x, ?y, [?x, ?y|?_]).
-next_to(?x, ?y, [?_|?zs]) :- next_to(?x, ?y, ?zs).
+next_to(?x, ?y, [?x, ?y|?]).
+next_to(?x, ?y, [?|?zs]) :- next_to(?x, ?y, ?zs).
 
 waterDrinker(zebraPuzzle, ?waterdrinker) :- zebra(?waterdrinker, ?_zebraowner).
 zebraOwner(zebraPuzzle, ?zebraowner) :- zebra(?_waterdrinker, ?zebraowner).

package/package.json

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

package/playground.html

@@ -869,9 +869,12 @@ answer(ok) :- eq(ok, ok).
           while (j < text.length && /[\d.]/.test(text[j])) j++;
           out += span('number', text.slice(i, j));
           i = j;
-        } else if (ch === '?' && /[A-Za-z_]/.test(text[i + 1] || '')) {
-          let j = i + 2;
-          while (j < text.length && /[A-Za-z0-9_]/.test(text[j])) j++;
+        } else if (ch === '?') {
+          let j = i + 1;
+          if (/[A-Za-z_]/.test(text[j] || '')) {
+            j++;
+            while (j < text.length && /[A-Za-z0-9_]/.test(text[j])) j++;
+          }
           out += span('variable', text.slice(i, j));
           i = j;
         } else if (/[a-z]/.test(ch)) {

package/src/parser.js

@@ -43,14 +43,14 @@ function isNameContinueCode(code) {
 function isQuestionVariableStart(source, pos) {
   if (source[pos] !== '?') return false;
   const code = (source[pos + 1] ?? '').charCodeAt(0);
-  return code === 95 || isAsciiLetterCode(code);
+  return !source[pos + 1] || code === 95 || isAsciiLetterCode(code) || !isNameContinueCode(code);
 }
 
 function isPlainAtomStartCode(code) {
   return code >= 97 && code <= 122;
 }
 
-const graphicAtomChars = '#$&*+-/<=>?@^~\\';
+const graphicAtomChars = '#$&*+-/<=>@^~\\';
 
 function isGraphicAtomCode(code) {
   return graphicAtomChars.includes(String.fromCharCode(code));
@@ -172,10 +172,9 @@ class Parser {
     if (isQuestionVariableStart(this.source, this.pos)) {
       const start = this.pos;
       this.take(); // ?
-      this.take();
+      if (isNameContinueCode(this.peek().charCodeAt(0))) this.take();
       while (isNameContinueCode(this.peek().charCodeAt(0))) this.take();
-      let text = this.source.slice(start, this.pos);
-      if (text === '?_') text = `__anon${this.anonymous++}`;
+      const text = this.source.slice(start, this.pos);
       return { type: TOK.VAR, text, line };
     }
 
@@ -259,6 +258,7 @@ class Parser {
     if (this.token.type === TOK.VAR) {
       const name = this.token.text;
       this.advance();
+      if (name === '?') return variable(`__anon${this.anonymous++}`);
       return variable(name);
     }
     if (this.token.type === TOK.STRING) {
@@ -346,9 +346,9 @@ function isSimpleName(text) {
 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-Za-z_][A-Za-z0-9_]*$/;
+const SIMPLE_VARIABLE = /^\?(?:[A-Za-z_][A-Za-z0-9_]*)?$/;
 const SIMPLE_ATOM = /^[a-z][A-Za-z0-9_]*$/;
-const GRAPHIC_ATOM = /^[#$&*+\-\/<=>?@^~\\]+$/;
+const GRAPHIC_ATOM = /^[#$&*+\-\/<=>@^~\\]+$/;
 
 function parseClausesFastNoSource(source) {
   source = String(source ?? '');
@@ -370,7 +370,7 @@ function parseClausesFastNoSource(source) {
   const scalarOrVariableFast = (text) => {
     if (!text || !isFastScalarToken(text)) throw new Error('bad simple term');
     const first = text.charCodeAt(0);
-    if (text === '?_') return variable(`__anon${anonymous++}`);
+    if (text === '?') return variable(`__anon${anonymous++}`);
     if (SIMPLE_VARIABLE.test(text)) {
       const existing = variableCache.get(text);
       if (existing) return existing;

package/src/term.js

@@ -136,7 +136,7 @@ export function termIsGround(term, env = new Env()) {
   return resolved.args.every((arg) => termIsGround(arg, env));
 }
 
-const graphicAtomChars = new Set('#$&*+-/<=>?@^~\\'.split(''));
+const graphicAtomChars = new Set('#$&*+-/<=>@^~\\'.split(''));
 
 function isAbsoluteIriText(text) {
   return /^[A-Za-z][A-Za-z0-9+.-]*:[^\s<>"'{}|\\^`]*$/.test(text);

package/test/conformance/cases/arithmetic/extra_division_by_zero_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(division_by_zero_fails) :- div(1, 0, ?_).
+answer(division_by_zero_fails) :- div(1, 0, ?).

package/test/conformance/cases/atoms/103_angle_iri_atoms.eye

@@ -3,5 +3,5 @@ materialize(iri_subject, 1).
 materialize(iri_object, 1).
 triple(<https://example.org/alice>, <https://schema.org/name>, "Alice").
 triple(<urn:example:bob>, <https://schema.org/knows>, <https://example.org/alice>).
-iri_subject(?iri) :- triple(?iri, ?_, ?_).
-iri_object(?iri) :- triple(?_, <https://schema.org/knows>, ?iri).
+iri_subject(?iri) :- triple(?iri, ?, ?).
+iri_object(?iri) :- triple(?, <https://schema.org/knows>, ?iri).

package/test/conformance/cases/builtins/extra_difference_end_before_start_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(difference_end_before_start_fails) :- difference("2024-01-01", "2024-01-02", ?_).
+answer(difference_end_before_start_fails) :- difference("2024-01-01", "2024-01-02", ?).

package/test/conformance/cases/builtins/extra_difference_invalid_date_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(difference_invalid_date_fails) :- difference("2024-02-30", "2024-02-01", ?_).
+answer(difference_invalid_date_fails) :- difference("2024-02-30", "2024-02-01", ?).

package/test/conformance/cases/context/extra_holds_ignores_string_parts.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(holds_ignores_string_parts) :- holds("not a term", ?_, ?_).
+answer(holds_ignores_string_parts) :- holds("not a term", ?, ?).

package/test/conformance/cases/lists/020_nested_list_terms.eye

@@ -1,5 +1,5 @@
 % Reference 5.3, 5.4: lists may contain structured terms that unify positionally.
 node([pair(a, b), pair(c, d)]).
-answer(first_key, ?x) :- node([pair(?x, ?_), pair(c, d)]).
+answer(first_key, ?x) :- node([pair(?x, ?), pair(c, d)]).
 answer(second_key, ?x) :- node([pair(a, b), pair(?x, d)]).
 materialize(answer, 2).

package/test/conformance/cases/lists/extra_length_improper_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(length_improper_fails) :- length([a | b], ?_).
+answer(length_improper_fails) :- length([a | b], ?).

package/test/conformance/cases/rules/022_rule_head_structure.eye

@@ -1,5 +1,5 @@
 % Reference 5.3, 6, 7.1: structured rule heads destructure matching goals.
 unpack(pair(?x, ?y), ?x, ?y).
-answer(first, ?a) :- unpack(pair(alpha, beta), ?a, ?_).
-answer(second, ?b) :- unpack(pair(alpha, beta), ?_, ?b).
+answer(first, ?a) :- unpack(pair(alpha, beta), ?a, ?).
+answer(second, ?b) :- unpack(pair(alpha, beta), ?, ?b).
 materialize(answer, 2).

package/test/conformance/cases/terms/extra_arg_atom_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(arg_atom_fails) :- arg(1, atom, ?_).
+answer(arg_atom_fails) :- arg(1, atom, ?).

package/test/conformance/cases/terms/extra_arg_zero_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(arg_zero_fails) :- arg(0, pair(a, b), ?_).
+answer(arg_zero_fails) :- arg(0, pair(a, b), ?).

package/test/conformance/cases/terms/extra_compound_name_arguments_bad_args_fails.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(compound_name_arguments_bad_args_fails) :- compound_name_arguments(?_, pair, not_a_list).
+answer(compound_name_arguments_bad_args_fails) :- compound_name_arguments(?, pair, not_a_list).

package/test/conformance/cases/variables/007_anonymous_variables.eye

@@ -1,5 +1,5 @@
 % Reference 3.4, 5.1, 7.1: each anonymous variable occurrence is fresh.
 pair(a, one).
 pair(b, two).
-answer(fresh, yes) :- pair(a, ?_), pair(b, ?_).
+answer(fresh, yes) :- pair(a, ?), pair(b, ?).
 materialize(answer, 2).

package/test/conformance/cases/variables/026_question_underscore_named_variable_reuse.eye

@@ -1,4 +1,4 @@
-% Reference 3.4, 5.1: `?_name` variables are named variables; only exactly `?_` is anonymous.
+% Reference 3.4, 5.1: `?_name` variables are named variables; only exactly `?` is anonymous.
 pair(a, a).
 pair(a, b).
 answer(shared, ?_value) :- pair(?_value, ?_value).

package/test/conformance/cases/variables/anonymous_in_two_goals.eye

@@ -1,4 +1,4 @@
-% Each ?_ occurrence is fresh, so these two goals do not have to agree.
+% Each ? occurrence is fresh, so these two goals do not have to agree.
 materialize(answer, 1).
 pair(a, b).
-answer(ok) :- pair(?_, ?_).
+answer(ok) :- pair(?, ?).

package/test/conformance/cases/variables/extra_anonymous_not_reused.eye

@@ -1,2 +1,2 @@
 materialize(answer, 1).
-answer(anonymous_not_reused) :- eq(pair(?_, ?_), pair(a, b)).
+answer(anonymous_not_reused) :- eq(pair(?, ?), pair(a, b)).

package/test/conformance/cases/variables/question_anonymous_not_reused.eye

@@ -1,6 +1,6 @@
-% Each `?_` occurrence is anonymous and independent.
+% Each `?` occurrence is anonymous and independent.
 materialize(answer, 1).
 pair(a, b).
 pair(c, d).
-answer(left(?x)) :- pair(?x, ?_).
-answer(right(?y)) :- pair(?_, ?y).
+answer(left(?x)) :- pair(?x, ?).
+answer(right(?y)) :- pair(?, ?y).

package/test/conformance/expected-errors/syntax/bad_question_digit_variable.txt

@@ -1 +1 @@
-parse line 1: expected ), got 1
+parse line 1: bad character "?"

package/test/conformance/expected-errors/variables/question_digit_rejected.txt

@@ -1 +1 @@
-parse line 1: expected ), got 1
+parse line 1: bad character "?"

package/test/run-regression.mjs

@@ -639,9 +639,9 @@ function whiteBoxCases() {
       },
     },
     {
-      name: 'parser treats question-mark underscore as anonymous',
+      name: 'parser treats bare question mark as anonymous',
       run: () => {
-        const clauses = parseProgramText('p(?_, ?_).\n');
+        const clauses = parseProgramText('p(?, ?).\n');
         const left = clauses[0].head.args[0].name;
         const right = clauses[0].head.args[1].name;
         assertEqual(left.startsWith('__anon'), true, 'left anonymous');