Pab/devel - conditional exports

aldor/aldor/lib/libfoamlib/al/Makefile.in

@@ -50,6 +50,7 @@ libraryname	:= foamlib
 AXLFLAGS	:= -Z db -Fc -Q8 $(AXLCDB)
 
 include $(top_srcdir)/lib/buildlib.mk
+libraryincdir := $(top_srcdir)/aldor/lib/libfoamlib/al
 
 Libraryname	:= Axl
 

aldor/aldor/lib/libfoamlib/al/list.as

@@ -307,12 +307,16 @@ List(S: Type): ListCategory S with == FakedConditionalOperations S add {
 --    on conditionals
 FakedConditionalOperations(S: Type): with {
 	=: (%, %) -> Boolean;
+	~=: (%, %) -> Boolean;
 	<<: (TextWriter, %) -> TextWriter;
 	member?: (S, %) -> Boolean;
 }  == add {
 	(a: %) = (b: %): Boolean == {
 		error "no equality on this object";
 	}
+	(a: %) ~= (b: %): Boolean == {
+		error "no equality on this object";
+	}
 	member?(a: S, b: %): Boolean == {
 		error "no member? on this object";
 	}

aldor/aldor/src/ablogic.c

@@ -70,8 +70,8 @@ local DNF_Atom	ablogNextIx;
 local void
 ablogInitTables(void)
 {
-	ablogToTable = tblNew((TblHashFun) abHash, (TblEqFun) sefoEqual);
-	ablogFrTable = tblNew((TblHashFun) 0,      (TblEqFun) 0);
+	ablogToTable = tblNew((TblHashFun) abHashSefo, (TblEqFun) sefoEqual);
+	ablogFrTable = tblNew((TblHashFun) 0,          (TblEqFun) 0);
 	ablogNextIx  = 1;
 }
 
@@ -125,6 +125,7 @@ ablogInit(void)
 
 	ablogInitTables();
 	fmtRegister("AbLogic", ablogFormatter);
+	fmtRegister("DNF", dnfFormatter);
 
 	ablogIsInit = true;
 }

aldor/aldor/src/absyn.c

@@ -208,6 +208,22 @@ abNewOfOpAndList(AbSynTag abtag, SrcPos pos, AbSyn op, AbSynList args)
 	return ab;
 }
 
+AbSyn
+abNewAndAll(SrcPos pos, AbSynList absyn)
+{
+	if (cdr(absyn) == listNil(AbSyn))
+		return car(absyn);
+
+	return abNewAnd(pos, car(absyn), abNewAndAll(pos, cdr(absyn)));
+}
+AbSyn
+abNewOrAll(SrcPos pos, AbSynList absyn)
+{
+	if (cdr(absyn) == listNil(AbSyn))
+		return car(absyn);
+	return abNewOr(pos, car(absyn), abNewAndAll(pos, cdr(absyn)));
+}
+
 void
 abFree(AbSyn ab)
 {
@@ -700,6 +716,46 @@ abEqualModDeclares(AbSyn ab1, AbSyn ab2)
 	h &= 0x3FFFFFFF;		\
 }
 
+Hash
+abHashSefo(AbSyn ab)
+{
+	Hash	h = 0;
+	Length	i;
+
+	if (abHasTag(ab, AB_Declare))
+		return abHashSefo(ab->abDeclare.type);
+	if (abHasTag(ab, AB_Qualify))
+		return abHashSefo(ab->abQualify.what);
+	if (abHasTag(ab, AB_PretendTo))
+		return abHashSefo(ab->abPretendTo.expr);
+	if (abHasTag(ab, AB_RestrictTo))
+		return abHashSefo(ab->abRestrictTo.expr);
+	if (abHasTag(ab, AB_Test))
+		return abHashSefo(ab->abTest.cond);
+
+	if (abIsSymTag(abTag(ab)))
+		h = strHash(symString(abLeafSym(ab)));
+	else if (abIsDocTag(abTag(ab)))
+		h = strHash(docString(abLeafDoc(ab)));
+	else if (abIsStrTag(abTag(ab)))
+		h = strHash(abLeafStr(ab));
+	else if (abHasTag(ab, AB_Define)) {
+		abHashArg(h, abHashSefo(ab->abDefine.lhs));
+		abHashArg(h, abHashSefo(ab->abDefine.rhs));
+	}
+	else if (abTag(ab) == AB_Lambda) {
+		abHashArg(h, abHashSefo(ab->abLambda.param));
+		abHashArg(h, abHashSefo(ab->abLambda.rtype));
+	}
+	else
+		for (i = 0; i < abArgc(ab); i++)
+			abHashArg(h, abHashSefo(abArgv(ab)[i]));
+
+	h += abInfo(abTag(ab)).hash;
+	h &= 0x3FFFFFFF;
+	return h;
+}
+
 Hash
 abHash(AbSyn ab)
 {
@@ -1625,6 +1681,7 @@ abTransferSemantics(AbSyn from, AbSyn to)
 		abSetImplicit(to, abImplicit(from));
 		abSetTContext(to, abTContext(from));
 		abSetDefineIdx(to, abDefineIdx(from));
+		abSetSelf(to, abSelf(from));
 	}
 
 	switch (abState(from)) {
@@ -1669,6 +1726,7 @@ abNewSemantics(void)
 	as->embed	= 0;
 	as->defnIdx     = -1;
 	as->impl	= NULL;
+	as->self	= listNil(Syme);
 
 	return as;
 }
@@ -1709,6 +1767,17 @@ abSetSyme(AbSyn ab, Syme syme)
 	return syme;
 }
 
+void
+abSetSelf(AbSyn ab, SymeList symes)
+{
+	/* scobind may hand this a 0 ab */
+	if (ab) {
+		if (! ab->abHdr.seman)
+			ab->abHdr.seman = abNewSemantics();
+		ab->abHdr.seman->self = symes;
+	}
+}
+
 void
 abSetDefineIdx(AbSyn ab, int idx)
 {

aldor/aldor/src/absyn.h

@@ -290,6 +290,7 @@ struct abSeman {
 	AbSyn	implicit;	/* Implicit operator on expression. */
 	AbEmbed embed;		/* Implicit embedding for product contexts. */
 	SImpl   impl;		/* Syme implementation, if any */
+	SymeList self;          /* value of '%' for withs */
 };
 
 typedef struct abSeman *AbSeman;
@@ -870,6 +871,7 @@ extern struct ab_info	abInfoTable[];
 # define abTContext(a)	  ((a)->abHdr.seman ? (a)->abHdr.seman->embed	 : 0)
 # define abDefineIdx(a)	  ((a)->abHdr.seman ? (a)->abHdr.seman->defnIdx  : -1)
 # define abSymeImpl(a)	  ((a)->abHdr.seman ? (a)->abHdr.seman->impl	 : 0)
+# define abSelf(a)	  ((a)->abHdr.seman ? (a)->abHdr.seman->self	 : 0)
 
 # define abRepeatIterc(a) (abArgc(a)-1) /* -1 for body */
 # define abCollectIterc(a)(abArgc(a)-1) /* -1 for body */
@@ -943,13 +945,17 @@ extern AbSyn	abNewOfList		(AbSynTag t, SrcPos, AbSynList);
 extern AbSyn	abNewOfOpAndList	(AbSynTag t, SrcPos,AbSyn op,AbSynList);
 extern AbSyn	abNewOfToken		(AbSynTag t, Token);
 
+extern AbSyn    abNewAndAll		(SrcPos, AbSynList);
+extern AbSyn    abNewOrAll		(SrcPos, AbSynList);
+
 extern AbSyn	abCopy			(AbSyn);
 extern AbSyn	abReposition		(AbSyn, SrcPos pos, SrcPos end);
 extern AbSyn	abMarkAsMacroExpanded	(AbSyn);
 extern Bool	abContains		(AbSyn, AbSyn);
 extern Bool	abEqual			(AbSyn, AbSyn);
 extern Bool	abEqualModDeclares	(AbSyn, AbSyn);
 extern Hash	abHash			(AbSyn);
+extern Hash	abHashSefo		(AbSyn);
 extern Hash	abHashList		(AbSynList);
 extern Hash	abHashModDeclares	(AbSyn);
 extern void	abSubSymbol		(AbSyn, Symbol, Symbol);
@@ -976,6 +982,7 @@ extern AbSeman	abNewSemantics		(void);
 extern Doc	abSetComment		(AbSyn, Doc);
 extern Stab	abSetStab		(AbSyn, Stab);
 extern Syme	abSetSyme		(AbSyn, Syme);
+extern void	abSetSelf		(AbSyn, SymeList);
 extern TForm	abSetTForm		(AbSyn, TForm);
 extern AbSyn	abSetImplicit		(AbSyn, AbSyn);
 extern AbEmbed	abSetTContext		(AbSyn, AbEmbed);

aldor/aldor/src/cmdline.c

@@ -882,8 +882,6 @@ cmdDoOptDeveloper(String arg)
 		NoWhereHack = true;
 	else if (strAEqual("runtime-hashcheck", arg))
 		genSetHashcheck();
-	else if (strAEqual("old-hcodes", arg))
-		genResetNewHashCodes();
 	else if (strAIsPrefix("keyword", arg)) {
 		String darg = cmdDGetOptArg(arg, "keyword", NULL);
 		cmdDoKeywordStatus(darg, true);