version 2 of doc

examples/gfcc/Imper.gf

@@ -19,7 +19,6 @@ abstract Imper = PredefAbs ** {
               (Fun AS V -> Rec AS) -> Program ;
     FunctNil : (V : Typ) -> 
                  Stm -> (Fun NilTyp V -> Program) -> Program ;
-
     RecOne  : (A : Typ) -> (Var A -> Stm) -> Program -> Rec (ConsTyp A NilTyp) ;
     RecCons : (A : Typ) -> (AS : ListTyp) -> 
                   (Var A -> Rec AS) -> Program -> Rec (ConsTyp A AS) ;
@@ -38,16 +37,15 @@ abstract Imper = PredefAbs ** {
     EInt   : Int -> Exp (TNum TInt) ;
     EFloat : Int -> Int -> Exp (TNum TFloat) ;
     ELt    : (n : NumTyp) -> let Ex = Exp (TNum n) in Ex -> Ex -> Exp (TNum TInt) ;
-    EApp   : (AS : ListTyp) -> (V : Typ) -> Fun AS V -> ListExp AS -> Exp V ;
     EAdd, EMul, ESub : (n : NumTyp) -> let Ex = Exp (TNum n) in Ex -> Ex -> Ex ;
+    EAppNil : (V : Typ) -> Fun NilTyp V -> Exp V ;
+    EApp    : (AS : ListTyp) -> (V : Typ) -> Fun AS V -> ListExp AS -> Exp V ;
 
     TNum   : NumTyp -> Typ ;  
     TInt, TFloat : NumTyp ;
-
     NilTyp  : ListTyp ;
     ConsTyp : Typ -> ListTyp -> ListTyp ;
 
-    NilExp  : ListExp NilTyp ;
     OneExp  : (A : Typ) -> Exp A -> ListExp (ConsTyp A NilTyp) ;
     ConsExp : (A : Typ) -> (AS : ListTyp) -> 
                  Exp A -> ListExp AS -> ListExp (ConsTyp A AS) ;

examples/gfcc/ImperC.gf

@@ -43,6 +43,7 @@ concrete ImperC of Imper = open ResImper in {
     ESub _     = infixL 2 "-" ;
     ELt _      = infixN 1 "<" ;
 
+    EAppNil val f = constant (f.s ++ paren []) ;
     EApp args val f exps = constant (f.s ++ paren exps.s) ;
 
     TNum t  = t ;
@@ -50,8 +51,6 @@ concrete ImperC of Imper = open ResImper in {
     TFloat  = ss "float" ;
     NilTyp  = ss [] ;
     ConsTyp = cc2 ;
-
-    NilExp = ss [] ;
     OneExp _ e = e ;
     ConsExp _ _ e es = ss (e.s ++ "," ++ es.s) ;
 }

examples/gfcc/ImperJVM.gf

@@ -75,6 +75,9 @@ flags lexer=codevars ; unlexer=code ; startcat=Stm ;
     ESub       = binopt "_sub" ;
     EMul       = binopt "_mul" ;
     ELt t      = binop ("invokestatic" ++ t.s ++ "runtime/lt" ++ paren (t.s ++ t.s) ++ "i") ;
+    EAppNil val f = instr (
+      "invokestatic" ++ f.s ++ paren [] ++ val.s
+      ) ;
     EApp args val f exps = instr (
       exps.s ++
       "invokestatic" ++ f.s ++ paren args.s ++ val.s
@@ -83,11 +86,8 @@ flags lexer=codevars ; unlexer=code ; startcat=Stm ;
     TNum t = t ;
     TInt   = ss "i" ;
     TFloat = ss "f" ;
-
     NilTyp = ss [] ;
     ConsTyp = cc2 ;
-
-    NilExp = ss [] ;
     OneExp _ e = e ;
     ConsExp _ _ = cc2 ;
 }