Lm to lsts qpeofjf

SRC/index-index.lm

@@ -16,7 +16,6 @@ import SRC/index-globals.lm;
 import SRC/index-tokenize.lm;
 import SRC/index-types.lm;
 import SRC/index-context.lm;
-import SRC/index-ast.lm;
 import SRC/index-preprocess.lm;
 import SRC/index-plugins.lm;
 

SRC/index-tokenize.lm

@@ -1,5 +1,3 @@
 
-import SRC/with-location.lm;
-import SRC/with-key.lm;
 import SRC/to-smart-string.lsts;
 import SRC/formatted-location.lsts;

SRC/unit-ast.lsts

@@ -11,3 +11,6 @@ import SRC/smart-token-location.lsts;
 import SRC/plus.lsts;
 import SRC/unique.lsts;
 import SRC/without-location.lsts;
+import SRC/with-location.lsts;
+import SRC/with-key.lsts;
+import SRC/var-name-if-var.lsts;

SRC/var-name-if-var.lsts

@@ -0,0 +1,8 @@
+
+let var-name-if-var(t: AST): CString = (
+   match t {
+      Var{key=key} => key;
+      Lit{key=key} => key;
+      _ => c"";
+   }
+);

SRC/with-key.lsts

@@ -0,0 +1,4 @@
+
+let with-key(t: Token, k: CString): Token = (
+   Token{ k, iuid(), t.location }
+);

SRC/with-location.lsts

@@ -0,0 +1,17 @@
+
+let with-location(term: AST, loc: SourceLocation): AST = (
+   match term {
+      Var{key=key,token=token} => Var{key,with-location(token,loc)};
+      Lit{key=key,token=token} => Lit{key,with-location(token,loc)};
+      App{left=left,right=right} => App{close(with-location(left,loc)),close(with-location(right,loc))};
+      Seq{left=left,right=right} => Seq{close(with-location(left,loc)),close(with-location(right,loc))};
+      Abs{lhs=lhs,rhs=rhs,tt=tt} => Abs{close(with-location(lhs,loc)),close(with-location(rhs,loc)),tt};
+      Typedef{lhs=lhs,rhs=rhs} => Typedef{close(with-location(lhs,loc)),close(with-location(rhs,loc))};
+      Glb{key=key,val=val} => Glb{with-location(key,loc),close(with-location(val,loc))};
+      _ => term;
+   }
+);
+
+let with-location(t: Token, loc: SourceLocation): Token = (
+   if non-zero(t.location) then t else Token{ t.key, iuid(), loc }
+);