Changeset 823

Timestamp:

Aug 3, 2012 12:47:52 AM (12 years ago)

Author:

Anya Helene Bagge

Message:

Allow accessing fields by numbers (closes #116).

File:

• trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Expressions.rsc (modified) (3 diffs)

trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Expressions.rsc

@@ -202 +202 @@
 
 tuple[AST,Env] chkInit(AST typ, AST body, f:Field(n, e), env) {
+termPrintln("chkInit: ", n);
         <ft, env> = getField(typ, body, n, env);
         <e, et, env> = checkExpr(e, env);
@@ -393 +394 @@
                 try {
                         info = lookupDef(t, env);
+                        termPrintln("chkExpr DotOp: ", n);
+                        
                         <ft, env> = getField(t, info.body, n, env);
                         return <DotOp(e, n), ft, env>;
@@ -435 +438 @@
 
 tuple[AST,Env] getField(AST t, Body(Struct(seq(ds))), AST n, Env env) {
-        for(TypeField(VarDecl(m, fn, ft, fi)) <- ds) {
-                if(fn == n)
-                        return <ft, addTokenRef(n, fn, env)>;
-        } 
-        env = errorMark(env, "Unknown field \'<nameToStr(n)>\' in type \'<dispNameOf(t, env)>\'", locOf(n));
+        if(leaf(kStr:/[0-9]+/) := n) {
+                k = toInt(kStr);
+                i = 1;
+                for(TypeField(VarDecl(m, fn, ft, fi)) <- ds) {
+                        if(i == k)
+                                return <ft, addTokenRef(n, VarName(fn, ft), env)>;
+                        i = i + 1;
+                                
+                }
+                env = errorMark(env, "Unknown field #<k> in type \'<dispNameOf(t, env)>\'", locOf(n));
+        }
+        else {
+                for(TypeField(VarDecl(m, fn, ft, fi)) <- ds) {
+                        if(fn == n)
+                                return <ft, addTokenRef(n, VarName(fn, ft), env)>;
+                }
+                env = errorMark(env, "Unknown field \'<nameToStr(n)>\' in type \'<dispNameOf(t, env)>\'", locOf(n));
+        }
         return <Unknown(), env>;
 }