[commit: ghc] master: Fix formatting bug in core-spec. (c4c8924)

git at git.haskell.org git at git.haskell.org
Thu Sep 18 21:01:20 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c4c892456d29740118ca80cbc565ef4750885e13/ghc

>---------------------------------------------------------------

commit c4c892456d29740118ca80cbc565ef4750885e13
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Sep 18 17:00:37 2014 -0400

    Fix formatting bug in core-spec.


>---------------------------------------------------------------

c4c892456d29740118ca80cbc565ef4750885e13
 docs/core-spec/CoreLint.ott  |   2 +-
 docs/core-spec/CoreSyn.ott   |   2 ++
 docs/core-spec/core-spec.pdf | Bin 339274 -> 339243 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/core-spec/CoreLint.ott b/docs/core-spec/CoreLint.ott
index 4c51a05..56b4b99 100644
--- a/docs/core-spec/CoreLint.ott
+++ b/docs/core-spec/CoreLint.ott
@@ -247,7 +247,7 @@ G |-co g t0 : s[m |-> t0] ~R k t[n |-> t0]
 
 C = T_R0 </ axBranchkk // kk />
 0 <= ind < length </ axBranchkk // kk />
-forall </ ni_Ri // i />. (</ s1j // j /> ~> t1) = (</ axBranchkk // kk />)[ind]
+forall </ ni_^^Ri // i />. (</ s1j // j /> ~> t1) = (</ axBranchkk // kk />)[ind]
 </ G |-co gi : s'i ~Ri k'i t'i // i />
 </ substi @ // i /> = inits(</ [ ni |-> s'i ] // i />)
 </ ni = zi_ki // i />
diff --git a/docs/core-spec/CoreSyn.ott b/docs/core-spec/CoreSyn.ott
index 56594ec..0c5b304 100644
--- a/docs/core-spec/CoreSyn.ott
+++ b/docs/core-spec/CoreSyn.ott
@@ -235,6 +235,8 @@ type_list :: 'TypeList_' ::= {{ com List of types }}
 RA {{ tex {\!\!\!{}_{\rho} } }} :: 'RoleAnnot_' ::= {{ com Role annotation }}
   | _ R                    :: M :: annotation
   {{ tex {\!\!\!{}_{[[R]]} } }}
+  | _ ^^ R                 :: M :: spaced_annotation
+  {{ tex {}_{[[R]]} }}
 
 role_list {{ tex {\overline{\rho_j} }^j }} :: 'RoleList_' ::= {{ com List of roles }}
   | </ Ri // , // i />       ::   :: List
diff --git a/docs/core-spec/core-spec.pdf b/docs/core-spec/core-spec.pdf
index 5d9f29c..52f2e39 100644
Binary files a/docs/core-spec/core-spec.pdf and b/docs/core-spec/core-spec.pdf differ



More information about the ghc-commits mailing list