Refactoring of lookups via parent accounts

Author: mikera

convex-core/src/main/java/convex/core/data/AccountStatus.java

@@ -52,7 +52,7 @@ public class AccountStatus extends ARecord {
 	private static final int HAS_METADATA=1<<FORMAT.indexFor(Keywords.METADATA);
 	private static final int HAS_PARENT=1<<FORMAT.indexFor(Keywords.PARENT);
 
-	protected static final int INCLUSION_MASK=0xff;
+	protected static final int INCLUSION_MASK=0x01ff;
 
 	private AccountStatus(long sequence, AccountKey publicKey, long balance,
 			long memory, 

convex-core/src/main/java/convex/core/lang/Compiler.java

@@ -198,12 +198,11 @@ private static Context compileSymbol(Symbol sym, Context context) {
 		}
 
 		// Regular symbol lookup in environment
-		Address address=context.getAddress();
-		return compileEnvSymbol(address,sym,context);
+		return compileEnvSymbol(sym,context);
 	}
 
-	private static Context compileEnvSymbol(Address address,Symbol sym, Context context) {
-		// Optional code for :static embedding
+	private static Context compileEnvSymbol(Symbol sym, Context context) {
+		Address address=context.getAddress();// Optional code for :static embedding
 		if (Constants.OPT_STATIC) {
 			// Get metadata for symbol.
 			AHashMap<ACell, ACell> meta=context.lookupMeta(sym);

convex-core/src/main/java/convex/core/lang/Context.java

@@ -700,28 +700,32 @@ public MapEntry<Symbol,ACell> lookupDynamicEntry(Address address,Symbol sym) {
 		return lookupDynamicEntry(as,sym);
 	}
 
-
-
 	private MapEntry<Symbol,ACell> lookupDynamicEntry(AccountStatus as,Symbol sym) {
 		// Get environment for Address, or default to initial environment
-		AHashMap<Symbol, ACell> env = (as==null)?Core.ENVIRONMENT:as.getEnvironment();
-
-
-		MapEntry<Symbol,ACell> result=env.getEntry(sym);
+		for (int i=0; i<16; i++) {
+			if (as==null) return Core.ENVIRONMENT.getEntry(sym);
 
-		if (result==null) {
-			AccountStatus aliasAccount=getAliasedAccount(env);
-			result = lookupAliasedEntry(aliasAccount,sym);
+			MapEntry<Symbol,ACell> result=as.getEnvironment().getEntry(sym);
+			if (result!=null) return result;
+			
+			Address parent=as.getParent();
+			as=(parent==null)?null:getAccountStatus(parent);
 		}
-		return result;
+		return null;
 	}
-
-	private MapEntry<Symbol,ACell> lookupAliasedEntry(AccountStatus as,Symbol sym) {
-		if (as==null) return null;
-		AHashMap<Symbol, ACell> env = as.getEnvironment();
-		return env.getEntry(sym);
+	
+	/**
+	 * Looks up the account for an Symbol alias in the given environment.
+	 * @param env
+	 * @param path An alias path
+	 * @return AccountStatus for the alias, or null if not present
+	 */
+	private AccountStatus getAliasedAccount(AHashMap<Symbol, ACell> env) {
+		// TODO: alternative core accounts
+		return getCoreAccount();
 	}
 
+
 	/**
 	 * Gets the account status for the current Address
 	 *
@@ -736,16 +740,6 @@ public AccountStatus getAccountStatus() {
 		return chainState.state.getAccount(a);
 	}
 
-	/**
-	 * Looks up the account for an Symbol alias in the given environment.
-	 * @param env
-	 * @param path An alias path
-	 * @return AccountStatus for the alias, or null if not present
-	 */
-	private AccountStatus getAliasedAccount(AHashMap<Symbol, ACell> env) {
-		// TODO: alternative core accounts
-		return getCoreAccount();
-	}
 
 	private AccountStatus getCoreAccount() {
 		return getState().getAccount(Core.CORE_ADDRESS);

convex-core/src/test/java/convex/core/lang/CoreTest.java

@@ -3007,11 +3007,25 @@ public void testDeploy() {
 
 	@Test 
 	public void testParent() {
-		Context ctx = exec(context(),"(def dad (deploy `(defn resolve [x] :foo) `(set-controller ~*address*)))");
+		Context ctx = context();
+		
+		// Create parent actor
+		ctx = exec(ctx,"(def dad (deploy `(defn baz [x] :foo) `(set-controller ~*address*) `(def CONST ^:static :bar)))");
+		Address dad=ctx.getResult();
+		
+		// create a child actor
+		ctx=exec(ctx,("(def son (deploy `(set-parent ~dad) `(set-controller ~*address*)))"));
+		
+		// call a function in parent
+		assertEquals(Keywords.FOO,eval(ctx,"(query-as son `(baz 'convex.core))"));
+		
+		assertEquals(Keywords.FOO,eval(ctx,"(son/baz :doesnt-matter)"));
 
-		ctx=exec(ctx,("(def son (deploy `(set-parent ~dad)))"));
+		// *parent* is correctly set
+		assertEquals(dad,eval(ctx,"(query-as son '*parent*)"));
 
-		// assertEquals(Keywords.FOO,eval(ctx,"(query-as son '(resolve convex.core))"));
+		// compilation of constants from parent
+		assertEquals(Constant.of(Keywords.BAR),eval(ctx,"(query-as son '(compile CONST))"));
 	}
 
 	@Test