Skip to content

Commit

Permalink
Update docs a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmchale
vmchale committed Sep 15, 2020
1 parent e4febd9 commit 030556b
Show file tree
Hide file tree
Showing 12 changed files with 189 additions and 95 deletions.
3 changes: 1 addition & 2 deletions doc/user-guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,7 @@ We can write our own minimal magical realism bot using builtin libraries:
(| "immortality")
(| "heliophagy")
(| "levitation")
(| "good skin")
(| "happiness"))]
(| "good skin"))]
"discovers the secret to ${secret}")
))]
"A ${profession} in ${bigCity} ${accomplishment}"))))
Expand Down
Binary file modified doc/user-guide.pdf
View file
Binary file not shown.
3 changes: 1 addition & 2 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,7 @@ <h2 id="magical-realism-bot">Magical Realism Bot</h2>
(| &quot;immortality&quot;)
(| &quot;heliophagy&quot;)
(| &quot;levitation&quot;)
(| &quot;good skin&quot;)
(| &quot;happiness&quot;))]
(| &quot;good skin&quot;))]
&quot;discovers the secret to ${secret}&quot;)
))]
&quot;A ${profession} in ${bigCity} ${accomplishment}&quot;))))</code></pre>
Expand Down
2 changes: 1 addition & 1 deletion language-dickinson.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ test-suite dickinson-test
text -any,
filepath -any,
tasty-golden -any,
pretty-simple -any,
pretty-simple >=4.0.0.0,
language-dickinson -any

if impl(ghc >=8.0)
Expand Down
31 changes: 21 additions & 10 deletions test/data/higherOrder.rename
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,29 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "top" :| []
, unique = Unique { unUnique = 6 }
, unique = Unique
{ unUnique = 6 }
, loc = ()
}
, defExpr = Lambda
{ exprAnn = ()
, lambdaVar = Name
{ name = "f" :| []
, unique = Unique { unUnique = 8 }
, unique = Unique
{ unUnique = 8 }
, loc = ()
}
, lambdaTy = TyFun () ( TyText () ) ( TyText () )
, lambdaTy = TyFun ()
( TyText () )
( TyText () )
, lambdaExpr = Apply
{ exprAnn = ()
, exprFun = Var
{ exprAnn = ()
, exprVar = Name
{ name = "f" :| []
, unique = Unique { unUnique = 8 }
, unique = Unique
{ unUnique = 8 }
, loc = ()
}
}
Expand All @@ -37,22 +42,25 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "main" :| []
, unique = Unique { unUnique = 7 }
, unique = Unique
{ unUnique = 7 }
, loc = ()
}
, defExpr = Let
{ exprAnn = ()
, letBinds =
( Name
{ name = "fun" :| []
, unique = Unique { unUnique = 9 }
, unique = Unique
{ unUnique = 9 }
, loc = ()
}
, Lambda
{ exprAnn = ()
, lambdaVar = Name
{ name = "a" :| []
, unique = Unique { unUnique = 10 }
, unique = Unique
{ unUnique = 10 }
, loc = ()
}
, lambdaTy = TyText ()
Expand All @@ -67,7 +75,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "a" :| []
, unique = Unique { unUnique = 10 }
, unique = Unique
{ unUnique = 10 }
, loc = ()
}
}
Expand All @@ -81,15 +90,17 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "top" :| []
, unique = Unique { unUnique = 6 }
, unique = Unique
{ unUnique = 6 }
, loc = ()
}
}
, exprArg = Var
{ exprAnn = ()
, exprVar = Name
{ name = "fun" :| []
, unique = Unique { unUnique = 9 }
, unique = Unique
{ unUnique = 9 }
, loc = ()
}
}
Expand Down
21 changes: 14 additions & 7 deletions test/data/lambda.rename
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "greeter" :| []
, unique = Unique { unUnique = 5 }
, unique = Unique
{ unUnique = 5 }
, loc = ()
}
, defExpr = Lambda
{ exprAnn = ()
, lambdaVar = Name
{ name = "name" :| []
, unique = Unique { unUnique = 7 }
, unique = Unique
{ unUnique = 7 }
, loc = ()
}
, lambdaTy = TyText ()
Expand All @@ -27,7 +29,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "name" :| []
, unique = Unique { unUnique = 7 }
, unique = Unique
{ unUnique = 7 }
, loc = ()
}
}
Expand All @@ -43,15 +46,17 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "main" :| []
, unique = Unique { unUnique = 6 }
, unique = Unique
{ unUnique = 6 }
, loc = ()
}
, defExpr = Let
{ exprAnn = ()
, letBinds =
( Name
{ name = "boy" :| []
, unique = Unique { unUnique = 8 }
, unique = Unique
{ unUnique = 8 }
, loc = ()
}
, Choice
Expand Down Expand Up @@ -79,15 +84,17 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "greeter" :| []
, unique = Unique { unUnique = 5 }
, unique = Unique
{ unUnique = 5 }
, loc = ()
}
}
, exprArg = Var
{ exprAnn = ()
, exprVar = Name
{ name = "boy" :| []
, unique = Unique { unUnique = 8 }
, unique = Unique
{ unUnique = 8 }
, loc = ()
}
}
Expand Down
15 changes: 10 additions & 5 deletions test/data/let.rename
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "letBinding" :| []
, unique = Unique { unUnique = 4 }
, unique = Unique
{ unUnique = 4 }
, loc = ()
}
, defExpr = Let
{ exprAnn = ()
, letBinds =
( Name
{ name = "a" :| []
, unique = Unique { unUnique = 5 }
, unique = Unique
{ unUnique = 5 }
, loc = ()
}
, Literal
Expand All @@ -24,7 +26,8 @@ Dickinson
[
( Name
{ name = "b" :| []
, unique = Unique { unUnique = 6 }
, unique = Unique
{ unUnique = 6 }
, loc = ()
}
, Literal
Expand All @@ -41,7 +44,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "a" :| []
, unique = Unique { unUnique = 5 }
, unique = Unique
{ unUnique = 5 }
, loc = ()
}
}
Expand All @@ -52,7 +56,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "b" :| []
, unique = Unique { unUnique = 6 }
, unique = Unique
{ unUnique = 6 }
, loc = ()
}
}
Expand Down
27 changes: 18 additions & 9 deletions test/data/multiLet.rename
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "letBinding" :| []
, unique = Unique { unUnique = 5 }
, unique = Unique
{ unUnique = 5 }
, loc = ()
}
, defExpr = Let
{ exprAnn = ()
, letBinds =
( Name
{ name = "a" :| []
, unique = Unique { unUnique = 7 }
, unique = Unique
{ unUnique = 7 }
, loc = ()
}
, Literal
Expand All @@ -24,7 +26,8 @@ Dickinson
[
( Name
{ name = "b" :| []
, unique = Unique { unUnique = 8 }
, unique = Unique
{ unUnique = 8 }
, loc = ()
}
, Literal
Expand All @@ -41,7 +44,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "a" :| []
, unique = Unique { unUnique = 7 }
, unique = Unique
{ unUnique = 7 }
, loc = ()
}
}
Expand All @@ -52,7 +56,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "b" :| []
, unique = Unique { unUnique = 8 }
, unique = Unique
{ unUnique = 8 }
, loc = ()
}
}
Expand All @@ -65,15 +70,17 @@ Dickinson
{ declAnn = ()
, defName = Name
{ name = "main" :| []
, unique = Unique { unUnique = 6 }
, unique = Unique
{ unUnique = 6 }
, loc = ()
}
, defExpr = Let
{ exprAnn = ()
, letBinds =
( Name
{ name = "a" :| []
, unique = Unique { unUnique = 9 }
, unique = Unique
{ unUnique = 9 }
, loc = ()
}
, Literal
Expand All @@ -89,7 +96,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "letBinding" :| []
, unique = Unique { unUnique = 5 }
, unique = Unique
{ unUnique = 5 }
, loc = ()
}
}
Expand All @@ -100,7 +108,8 @@ Dickinson
{ exprAnn = ()
, exprVar = Name
{ name = "a" :| []
, unique = Unique { unUnique = 9 }
, unique = Unique
{ unUnique = 9 }
, loc = ()
}
}
Expand Down
Loading

0 comments on commit 030556b

Please sign in to comment.