Added some APL keywords as first language

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashA.java

@@ -32,11 +32,16 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashA implements FCDotCLKSourceCakePoints {
 	
-	AND(FCDotCLKSource.APL_DYADIC,
+	ADD(FCDotCLKSource.APL.toQNameAlias("+")),
+	AND(FCDotCLKSource.APL.toQNameAlias("∧"),
 			FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,
 			FCDotCLKSource.ERLANG,
 			FCDotCLKSource.PYTHON),
+	ATOP(FCDotCLKSource.APL.toQNameAlias("⍤")),
+	AT(FCDotCLKSource.APL.toQNameAlias("@")),
+	AXIS(FCDotCLKSource.APL.toQNameAlias("["), FCDotCLKSource.APL.toQNameAlias("]")),
+	ASSIGN(FCDotCLKSource.APL.toQNameAlias("←")),
 	ABS(FCDotCLKSource.VHDL),
 	ACCESS(FCDotCLKSource.VHDL),
 	AFTER(FCDotCLKSource.VHDL, FCDotCLKSource.ERLANG),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashB.java

@@ -32,7 +32,10 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashB implements FCDotCLKSourceCakePoints {
 	
-	BINOMIAL(FCDotCLKSource.APL_DYADIC),
+	BINOMIAL(FCDotCLKSource.APL.toQNameAlias("!")),
+	BASE(FCDotCLKSource.APL.toQNameAlias("⊥")),
+	BIND(FCDotCLKSource.APL.toQNameAlias("∘")),
+	BESIDE(FCDotCLKSource.APL.toQNameAlias("∘")),
 	BEGIN(FCDotCLKSource.VHDL),
 	BLOCK(FCDotCLKSource.VHDL),
 	BODY(FCDotCLKSource.VHDL),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashC.java

@@ -32,6 +32,22 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashC implements FCDotCLKSourceCakePoints {
 	
+	CONJUGATE(FCDotCLKSource.APL.toQNameAlias("+")),
+	CEILING(FCDotCLKSource.APL.toQNameAlias("⌈")),
+	CIRCULAR(FCDotCLKSource.APL.toQNameAlias("○")),
+	CATENATE(FCDotCLKSource.APL.toQNameAlias(",")),
+	CATENATE_FIRST(FCDotCLKSource.APL.toQNameAlias("⍪")),
+	COMMUTE(FCDotCLKSource.APL.toQNameAlias("⍨")),
+	CONSTANT(FCDotCLKSource.APL.toQNameAlias("⍨"),
+			FCDotCLKSource.VHDL, 
+			FCDotCLKSource.CPP.toQNameAlias("const"),
+			FCDotCLKSource.JAVA.toQNameAlias("const"),
+			FCDotCLKSource.RUST.toQNameAlias("const"),
+			FCDotCLKSource.ES6.toQNameAlias("const")
+			),
+	COMMENT(FCDotCLKSource.APL.toQNameAlias("⍝"), FCDotCLKSource.VHDL.toQNameAlias("rem"), FCDotCLKSource.ERLANG.toQNameAlias("rem")),
+	COMMENT_BLOCK_BEGIN(FCDotCLKSource.APL.toQNameAlias("⟃")),
+	COMMENT_BLOCK_END(FCDotCLKSource.APL.toQNameAlias("⟄")),
 	CASE(FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,
 			FCDotCLKSource.JAVA,
@@ -39,12 +55,6 @@ public enum FCDotCLK1KDashC implements FCDotCLKSourceCakePoints {
 			FCDotCLKSource.ES6),
 	COMPONENT(FCDotCLKSource.VHDL),
 	CONFIGURATION(FCDotCLKSource.VHDL),
-	CONSTANT(FCDotCLKSource.VHDL, 
-			FCDotCLKSource.CPP.toQNameAlias("const"),
-			FCDotCLKSource.JAVA.toQNameAlias("const"),
-			FCDotCLKSource.RUST.toQNameAlias("const"),
-			FCDotCLKSource.ES6.toQNameAlias("const")
-			),
 	CATCH(FCDotCLKSource.CPP, FCDotCLKSource.JAVA, FCDotCLKSource.ERLANG, FCDotCLKSource.ES6),
 	CHAR(FCDotCLKSource.CPP, FCDotCLKSource.JAVA),
 	CHAR8_T(FCDotCLKSource.CPP),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashD.java

@@ -32,7 +32,12 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashD implements FCDotCLKSourceCakePoints {
 	
-	DIVIDE(FCDotCLKSource.APL_DYADIC, FCDotCLKSource.ERLANG.toQNameAlias("div")),
+	DIRECTION(FCDotCLKSource.APL.toQNameAlias("×")),
+	DIVIDE(FCDotCLKSource.APL.toQNameAlias("÷"), FCDotCLKSource.ERLANG.toQNameAlias("div")),
+	DEAL(FCDotCLKSource.APL.toQNameAlias("?")),
+	DROP(FCDotCLKSource.APL.toQNameAlias("↓")),
+	DISCLOSE(FCDotCLKSource.APL.toQNameAlias("↑"), FCDotCLKSource.APL.toQNameAlias("⊃")),
+	DEPTH(FCDotCLKSource.APL.toQNameAlias("≡")),
 	DISCONNECT(FCDotCLKSource.VHDL),
 	DOWNTO(FCDotCLKSource.VHDL),
 	DECLTYPE(FCDotCLKSource.CPP),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashE.java

@@ -32,7 +32,15 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashE implements FCDotCLKSourceCakePoints {
 	
-	EQUAL(FCDotCLKSource.APL_DYADIC),
+	EXPONENTIAL(FCDotCLKSource.APL.toQNameAlias("*")),
+	EQUAL(FCDotCLKSource.APL.toQNameAlias("=")),
+	ENCLOSE(FCDotCLKSource.APL.toQNameAlias("⊂")),
+	ENCLOSE_PARTITIONED(FCDotCLKSource.APL.toQNameAlias("⊂")),
+	ENLIST(FCDotCLKSource.APL.toQNameAlias("∊")),
+	EXPAND(FCDotCLKSource.APL.toQNameAlias("\\")),
+	EXPAND_FIRST(FCDotCLKSource.APL.toQNameAlias("⍀")),
+	EXECUTE(FCDotCLKSource.APL.toQNameAlias("⍎")),
+	EACH(FCDotCLKSource.APL.toQNameAlias("¨")),
 	ELSE(FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,
 			FCDotCLKSource.JAVA,

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashF.java

@@ -32,6 +32,17 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashF implements FCDotCLKSourceCakePoints {
 	
+	FLOOR(FCDotCLKSource.APL.toQNameAlias("⌊")),
+	FACTORIAL(FCDotCLKSource.APL.toQNameAlias("!")),
+	FIND(FCDotCLKSource.APL.toQNameAlias("⍷")),
+	FORMAT(FCDotCLKSource.APL.toQNameAlias("⍕")),
+	FUNCTION(FCDotCLKSource.APL.toQNameAlias("∇"),
+			FCDotCLKSource.APL.toQNameAlias("∆"),
+			FCDotCLKSource.APL.toQNameAlias("⍙"),
+			FCDotCLKSource.VHDL, 
+			FCDotCLKSource.ERLANG.toQNameAlias("fun"),
+			FCDotCLKSource.RUST.toQNameAlias("fn"),
+			FCDotCLKSource.ES6),
 	FILE(FCDotCLKSource.VHDL),
 	FOR(FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,
@@ -39,10 +50,6 @@ public enum FCDotCLK1KDashF implements FCDotCLKSourceCakePoints {
 			FCDotCLKSource.RUST,
 			FCDotCLKSource.PYTHON,
 			FCDotCLKSource.ES6),
-	FUNCTION(FCDotCLKSource.VHDL, 
-			FCDotCLKSource.ERLANG.toQNameAlias("fun"),
-			FCDotCLKSource.RUST.toQNameAlias("fn"),
-			FCDotCLKSource.ES6),
 	FALSE(FCDotCLKSource.CPP,
 			FCDotCLKSource.JAVA,
 			FCDotCLKSource.RUST,

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashG.java

@@ -32,11 +32,15 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashG implements FCDotCLKSourceCakePoints {
 	
+	GREATER_OR_EQUAL(FCDotCLKSource.APL.toQNameAlias("≥")),
+	GREATER(FCDotCLKSource.APL.toQNameAlias(">")),
+	GRADE_DOWN(FCDotCLKSource.APL.toQNameAlias("⍒")),
+	GRADE_UP(FCDotCLKSource.APL.toQNameAlias("⍋")),
+	GOTO(FCDotCLKSource.APL.toQNameAlias("→"), FCDotCLKSource.CPP, FCDotCLKSource.JAVA),
 	GENERATE(FCDotCLKSource.VHDL),
 	GENERIC(FCDotCLKSource.VHDL),
 	GROUP(FCDotCLKSource.VHDL),
 	GUARDED(FCDotCLKSource.VHDL),
-	GOTO(FCDotCLKSource.CPP, FCDotCLKSource.JAVA),
 	GLOBAL(FCDotCLKSource.PYTHON),
 	;
 	

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashI.java

@@ -32,6 +32,13 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashI implements FCDotCLKSourceCakePoints {
 	
+	INTERSECTION(FCDotCLKSource.APL.toQNameAlias("∩")),
+	INDEX_GENERATOR(FCDotCLKSource.APL.toQNameAlias("⍳")),
+	INDEX_OF(FCDotCLKSource.APL.toQNameAlias("⍳")),
+	INTERVAL_INDEX(FCDotCLKSource.APL.toQNameAlias("⍸")),
+	INDEX(FCDotCLKSource.APL.toQNameAlias("⌷")),
+	INNER_PRODUCT(FCDotCLKSource.APL.toQNameAlias(".")),
+	I_BEAM(FCDotCLKSource.APL.toQNameAlias("⌶")),
 	IF(FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,
 			FCDotCLKSource.JAVA,

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashK.java

@@ -32,6 +32,7 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashK implements FCDotCLKSourceCakePoints {
 	
+	KEY(FCDotCLKSource.APL.toQNameAlias("⌸")),
 	;
 	
 	final private FCDotCLKSourceLookup[] lookups; 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashL.java

@@ -32,7 +32,11 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashL implements FCDotCLKSourceCakePoints {
 	
-	LOGARITHM(FCDotCLKSource.APL_DYADIC),
+	LOGARITHM_NATURAL(FCDotCLKSource.APL.toQNameAlias("⍟")),
+	LOGARITHM(FCDotCLKSource.APL.toQNameAlias("⍟")),
+	LESS(FCDotCLKSource.APL.toQNameAlias("<")),
+	LESS_OR_EQUAL(FCDotCLKSource.APL.toQNameAlias("≤")),
+	LEFT(FCDotCLKSource.APL.toQNameAlias("⊣")),
 	LABEL(FCDotCLKSource.VHDL),
 	LIBRARY(FCDotCLKSource.VHDL),
 	LINKAGE(FCDotCLKSource.VHDL),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashM.java

@@ -32,15 +32,21 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashM implements FCDotCLKSourceCakePoints {
 	
-	MINUS(FCDotCLKSource.APL_DYADIC),
+	MAGNITUDE(FCDotCLKSource.APL.toQNameAlias("|")),
-	MINIMUM(FCDotCLKSource.APL_DYADIC),
+	MINIMUM(FCDotCLKSource.APL.toQNameAlias("⌊")),
-	MAXIMUM(FCDotCLKSource.APL_DYADIC),
+	MAXIMUM(FCDotCLKSource.APL.toQNameAlias("⌈")),
+	MEMBERSHIP(FCDotCLKSource.APL.toQNameAlias("∊")),
+	MATCH(FCDotCLKSource.APL.toQNameAlias("≡"), FCDotCLKSource.RUST),
+	MATCH_NOT(FCDotCLKSource.APL.toQNameAlias("≢")),
+	MATRIX_INVERSE(FCDotCLKSource.APL.toQNameAlias("⌹")),
+	MATRIX_DIVIDE(FCDotCLKSource.APL.toQNameAlias("⌹")),
+	MATERIALISE(FCDotCLKSource.APL.toQNameAlias("⌷")),
+	NEGATIVE_NUMBER(FCDotCLKSource.APL.toQNameAlias("¯")),
 	MAP(FCDotCLKSource.VHDL),
 	MOD(FCDotCLKSource.VHDL, FCDotCLKSource.RUST),
 	MUTABLE(FCDotCLKSource.CPP, FCDotCLKSource.RUST.toQNameAlias("mut")),
 	MODULE(FCDotCLKSource.JAVA),
 	MAYBE(FCDotCLKSource.ERLANG),
-	MATCH(FCDotCLKSource.RUST),
 	MOVE(FCDotCLKSource.RUST),
 	MACRO(FCDotCLKSource.RUST),
 	MACRO_RULES(FCDotCLKSource.RUST),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashN.java

@@ -32,15 +32,22 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashN implements FCDotCLKSourceCakePoints {
 	
-	NAND(FCDotCLKSource.APL_DYADIC, FCDotCLKSource.VHDL),
+	NEGATE(FCDotCLKSource.APL.toQNameAlias("-")),
-	NOR(FCDotCLKSource.APL_DYADIC, FCDotCLKSource.VHDL),
+	NOT(FCDotCLKSource.APL.toQNameAlias("~"),
+			FCDotCLKSource.VHDL,
+			FCDotCLKSource.CPP,
+			FCDotCLKSource.ERLANG,
+			FCDotCLKSource.PYTHON),
+	NAND(FCDotCLKSource.APL.toQNameAlias("⍲"), FCDotCLKSource.VHDL),
+	NOR(FCDotCLKSource.APL.toQNameAlias("⍱"), FCDotCLKSource.VHDL),
+	NOT_EQUAL(FCDotCLKSource.APL.toQNameAlias("≠"), FCDotCLKSource.CPP.toQNameAlias("not_eq")),
+	NEST(FCDotCLKSource.APL.toQNameAlias("⊆")),
+	NOT_MATCH(FCDotCLKSource.APL.toQNameAlias("≢")),
 	NEW(FCDotCLKSource.VHDL, FCDotCLKSource.CPP, FCDotCLKSource.JAVA, FCDotCLKSource.ES6),
 	NEXT(FCDotCLKSource.VHDL),
-	NOT(FCDotCLKSource.VHDL, FCDotCLKSource.CPP, FCDotCLKSource.ERLANG, FCDotCLKSource.PYTHON),
 	NULL(FCDotCLKSource.VHDL, FCDotCLKSource.JAVA, FCDotCLKSource.ES6),
 	NAMESPACE(FCDotCLKSource.CPP),
 	NOEXCEPT(FCDotCLKSource.CPP),
-	NOT_EQ(FCDotCLKSource.CPP),
 	NULLPTR(FCDotCLKSource.CPP),
 	NATIVE(FCDotCLKSource.JAVA),
 	NONE(FCDotCLKSource.PYTHON),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashO.java

@@ -32,11 +32,13 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashO implements FCDotCLKSourceCakePoints {
 	
-	OR(FCDotCLKSource.APL_DYADIC,
+	OR(FCDotCLKSource.APL.toQNameAlias("∨"),
 			FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,
 			FCDotCLKSource.ERLANG,
 			FCDotCLKSource.PYTHON),
+	OUTER_PRODUCT(FCDotCLKSource.APL.toQNameAlias("∘.")),
+	OVER(FCDotCLKSource.APL.toQNameAlias("⍥")),
 	OF(FCDotCLKSource.VHDL, FCDotCLKSource.ERLANG),
 	ON(FCDotCLKSource.VHDL),
 	OPEN(FCDotCLKSource.VHDL),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashP.java

@@ -32,8 +32,10 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashP implements FCDotCLKSourceCakePoints {
 	
-	PLUS(FCDotCLKSource.APL_DYADIC),
+	POWER(FCDotCLKSource.APL.toQNameAlias("*"), FCDotCLKSource.APL.toQNameAlias("⍣")),
-	POWER(FCDotCLKSource.APL_DYADIC),
+	PI_TIMES(FCDotCLKSource.APL.toQNameAlias("○")),
+	PARTITION(FCDotCLKSource.APL.toQNameAlias("⊆")),
+	PICK(FCDotCLKSource.APL.toQNameAlias("⊃")),
 	PACKAGE(FCDotCLKSource.VHDL, FCDotCLKSource.JAVA, FCDotCLKSource.ES6),
 	PORT(FCDotCLKSource.VHDL),
 	POSTPONED(FCDotCLKSource.VHDL),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashR.java

@@ -32,12 +32,26 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashR implements FCDotCLKSourceCakePoints {
 	
-	RESIDUE(FCDotCLKSource.APL_DYADIC),
+	RECIPROCAL(FCDotCLKSource.APL.toQNameAlias("÷")),
+	RESIDUE(FCDotCLKSource.APL.toQNameAlias("|")),
+	ROLL(FCDotCLKSource.APL.toQNameAlias("?")),
+	RESHAPE(FCDotCLKSource.APL.toQNameAlias("⍴")),
+	RAVEL(FCDotCLKSource.APL.toQNameAlias(",")),
+	REVERSE(FCDotCLKSource.APL.toQNameAlias("⌽")),
+	ROTATE(FCDotCLKSource.APL.toQNameAlias("⌽")),
+	REVERSE_FIRST(FCDotCLKSource.APL.toQNameAlias("⊖")),
+	ROTATE_FIRST(FCDotCLKSource.APL.toQNameAlias("⊖")),
+	REPLICATE(FCDotCLKSource.APL.toQNameAlias("/")),
+	REPLICATE_FIRST(FCDotCLKSource.APL.toQNameAlias("⌿")),
+	RIGHT(FCDotCLKSource.APL.toQNameAlias("⊢")),
+	REPRESENT(FCDotCLKSource.APL.toQNameAlias("⊤")),
+	REDUCTION(FCDotCLKSource.APL.toQNameAlias("/")),
+	REDUCTION_FIRST(FCDotCLKSource.APL.toQNameAlias("⌿")),
+	RANK(FCDotCLKSource.APL.toQNameAlias("⍤")),
 	RANGE(FCDotCLKSource.VHDL),
 	RECORD(FCDotCLKSource.VHDL),
 	REGISTER(FCDotCLKSource.VHDL, FCDotCLKSource.CPP),
 	REJECT(FCDotCLKSource.VHDL),
-	REMARK(FCDotCLKSource.VHDL.toQNameAlias("rem"), FCDotCLKSource.ERLANG.toQNameAlias("rem")),
 	REPORT(FCDotCLKSource.VHDL),
 	RETURN(FCDotCLKSource.VHDL,
 			FCDotCLKSource.CPP,

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java

@@ -32,6 +32,14 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashS implements FCDotCLKSourceCakePoints {
 	
+	SUBSTRACT(FCDotCLKSource.APL.toQNameAlias("-")),
+	SHAPE(FCDotCLKSource.APL.toQNameAlias("⍴")),
+	SPLIT(FCDotCLKSource.APL.toQNameAlias("↓")),
+	SAME(FCDotCLKSource.APL.toQNameAlias("⊣"), FCDotCLKSource.APL.toQNameAlias("⊢")),
+	SCAN(FCDotCLKSource.APL.toQNameAlias("\\")),
+	SCAN_FIRST(FCDotCLKSource.APL.toQNameAlias("⍀")),
+	STENCIL(FCDotCLKSource.APL.toQNameAlias("⌺")),
+	SPAWN(FCDotCLKSource.APL.toQNameAlias("&")),
 	SELECT(FCDotCLKSource.VHDL),
 	SEVERITY(FCDotCLKSource.VHDL),
 	SIGNAL(FCDotCLKSource.VHDL),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java

@@ -32,7 +32,11 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashT implements FCDotCLKSourceCakePoints {
 	
-	TIMES(FCDotCLKSource.APL_DYADIC),
+	TIMES(FCDotCLKSource.APL.toQNameAlias("×")),
+	TABLE(FCDotCLKSource.APL.toQNameAlias("⍪")),
+	TRANSPOSE(FCDotCLKSource.APL.toQNameAlias("⍉")),
+	TAKE(FCDotCLKSource.APL.toQNameAlias("↑")),
+	TALLY(FCDotCLKSource.APL.toQNameAlias("≢")),
 	THEN(FCDotCLKSource.VHDL),
 	TO(FCDotCLKSource.VHDL),
 	TRANSPORT(FCDotCLKSource.VHDL),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashU.java

@@ -32,11 +32,13 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashU implements FCDotCLKSourceCakePoints {
 	
+	UNIQUE_MASK(FCDotCLKSource.APL.toQNameAlias("≠")),
+	UNIQUE(FCDotCLKSource.APL.toQNameAlias("∪")),
+	UNION(FCDotCLKSource.APL.toQNameAlias("∪"), FCDotCLKSource.CPP, FCDotCLKSource.RUST),
 	UNAFFECTED(FCDotCLKSource.VHDL),
 	UNITS(FCDotCLKSource.VHDL),
 	UNTIL(FCDotCLKSource.VHDL),
 	USE(FCDotCLKSource.VHDL, FCDotCLKSource.RUST),
-	UNION(FCDotCLKSource.CPP, FCDotCLKSource.RUST),
 	UNSIGNED(FCDotCLKSource.CPP),
 	USING(FCDotCLKSource.CPP),
 	UNSAFE(FCDotCLKSource.RUST),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashV.java

@@ -32,6 +32,7 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashV implements FCDotCLKSourceCakePoints {
 	
+	VARIANT(FCDotCLKSource.APL.toQNameAlias("⍠")),
 	VARIABLE(FCDotCLKSource.VHDL),
 	VIRTUAL(FCDotCLKSource.CPP, FCDotCLKSource.RUST),
 	VOID(FCDotCLKSource.CPP, FCDotCLKSource.JAVA, FCDotCLKSource.ES6),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashW.java

@@ -32,6 +32,10 @@ import org.x4o.o2o.fc18.FourCornerDotCake;
  */
 public enum FCDotCLK1KDashW implements FCDotCLKSourceCakePoints {
 	
+	WITHOUT(FCDotCLKSource.APL.toQNameAlias("~")),
+	WHERE(FCDotCLKSource.APL.toQNameAlias("⍸"), FCDotCLKSource.RUST),
+	WINDOWED_REDUCTION(FCDotCLKSource.APL.toQNameAlias("/")),
+	WINDOWED_REDUCTION_FIRST(FCDotCLKSource.APL.toQNameAlias("⌿")),
 	WAIT(FCDotCLKSource.VHDL),
 	WHEN(FCDotCLKSource.VHDL, FCDotCLKSource.ERLANG),
 	WHILE(FCDotCLKSource.VHDL,
@@ -42,7 +46,6 @@ public enum FCDotCLK1KDashW implements FCDotCLKSourceCakePoints {
 			FCDotCLKSource.ES6),
 	WITH(FCDotCLKSource.VHDL, FCDotCLKSource.PYTHON, FCDotCLKSource.ES6),
 	WCHAR_T(FCDotCLKSource.CPP),
-	WHERE(FCDotCLKSource.RUST),
 	;
 	
 	final private FCDotCLKSourceLookup[] lookups; 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSource.java

@@ -25,17 +25,14 @@ package	org.x4o.o2o.fc18.clk1k;
 import java.util.Objects;
 
 /**
- * Source locations of coding keywords.
+ * Source locations of coding keywords, to have a category overview index.
  * 
  * @author Willem Cazander
  * @version 1.0 Dec 29, 2024
  */
 public enum FCDotCLKSource implements FCDotCLKSourceLookup {
 	
-	APL_DYADIC,
+	APL,
-	APL_MONADIC,
-	APL_CIRCLE,
-	APL_CMD,
 	VHDL,
 	CPP,
 	JAVA,
@@ -47,7 +44,7 @@ public enum FCDotCLKSource implements FCDotCLKSourceLookup {
 	//BASIC_MSX, // = disk-basic + msx stuff
 	//BASIC_MPI, // MPI-2 for BASIC
 	//FORTRAN // Leave out "openMP" junk because REAL computers have no shared memory model
-	//SQL // TODO: After (~full) SQL is added do cleanup of duplicate/abbr... CLK9P entries
+	//SQL // TODO: After (~full) SQL is added do cleanup of duplicate/abbr... CLK1K entries
 	;
 	
 	private FCDotCLKSource() {
@@ -63,6 +60,7 @@ public enum FCDotCLKSource implements FCDotCLKSourceLookup {
 		return name().toLowerCase();
 	}
 	
+	/// NOTE this is not really for parsing, after moving to nether DB it gets full version-ed mapping per language and dialect.
 	public FCDotCLKSourceLookup toQNameAlias(String qname) {
 		Objects.requireNonNull(qname);
 		return new FCDotCLKSourceLookup() {