Thanks to visit codestin.com
Credit goes to github.com

Skip to content

mutability flag: Use boolean, not option of unit #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

mutability flag: Use boolean, not option of unit #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion spectec/spec/1-syntax.watsup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ syntax resulttype hint(desc "result type") =

syntax limits hint(desc "limits") =
`[u32 .. u32]
syntax mutflag hint(desc "mutability flag") =
| MUT | IMMUT
syntax globaltype hint(desc "global type") =
MUT? valtype
mutflag valtype
syntax functype hint(desc "function type") =
resulttype -> resulttype
syntax tabletype hint(desc "table type") =
Expand All @@ -75,6 +77,7 @@ syntax externtype hint(desc "external type") =

var lim : limits
var ft : functype
var mf : mutflag
var gt : globaltype
var tt : tabletype
var mt : memtype
Expand Down
6 changes: 3 additions & 3 deletions spectec/spec/3-typing.watsup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ rule Instr_ok/local.tee:

rule Instr_ok/global.get:
C |- GLOBAL.GET x : epsilon -> t
-- if C.GLOBAL[x] = MUT? t
-- if C.GLOBAL[x] = mf t

rule Instr_ok/global.set:
C |- GLOBAL.SET x : t -> epsilon
Expand Down Expand Up @@ -379,7 +379,7 @@ rule Instr_const/ref.func:

rule Instr_const/global.get:
C |- (GLOBAL.GET x) CONST
-- if C.GLOBAL[x] = epsilon t
-- if C.GLOBAL[x] = IMMUT t


rule Expr_const: C |- instr* CONST
Expand Down Expand Up @@ -414,7 +414,7 @@ rule Func_ok:
rule Global_ok:
C |- GLOBAL gt expr : gt
-- Globaltype_ok: |- gt : OK
-- if gt = MUT? t
-- if gt = mf t
-- Expr_ok_const: C |- expr : t CONST

rule Table_ok:
Expand Down
112 changes: 59 additions & 53 deletions spectec/test-frontend/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,43 +88,48 @@ syntax resulttype = valtype*
;; 1-syntax.watsup:59.1-60.16
syntax limits = `[%..%]`(u32, u32)

;; 1-syntax.watsup:61.1-62.15
syntax globaltype = `MUT%?%`(()?, valtype)
;; 1-syntax.watsup:61.1-62.12
syntax mutflag =
| MUT
| IMMUT

;; 1-syntax.watsup:63.1-64.27
;; 1-syntax.watsup:63.1-64.18
syntax globaltype = `%%`(mutflag, valtype)

;; 1-syntax.watsup:65.1-66.27
syntax functype = `%->%`(resulttype, resulttype)

;; 1-syntax.watsup:65.1-66.17
;; 1-syntax.watsup:67.1-68.17
syntax tabletype = `%%`(limits, reftype)

;; 1-syntax.watsup:67.1-68.12
;; 1-syntax.watsup:69.1-70.12
syntax memtype = `%I8`(limits)

;; 1-syntax.watsup:69.1-70.10
;; 1-syntax.watsup:71.1-72.10
syntax elemtype = reftype

;; 1-syntax.watsup:71.1-72.5
;; 1-syntax.watsup:73.1-74.5
syntax datatype = OK

;; 1-syntax.watsup:73.1-74.69
;; 1-syntax.watsup:75.1-76.69
syntax externtype =
| GLOBAL(globaltype)
| FUNC(functype)
| TABLE(tabletype)
| MEMORY(memtype)

;; 1-syntax.watsup:86.1-86.44
;; 1-syntax.watsup:89.1-89.44
syntax sx =
| U
| S

;; 1-syntax.watsup:88.1-88.39
;; 1-syntax.watsup:91.1-91.39
syntax unop_IXX =
| CLZ
| CTZ
| POPCNT

;; 1-syntax.watsup:89.1-89.70
;; 1-syntax.watsup:92.1-92.70
syntax unop_FXX =
| ABS
| NEG
Expand All @@ -134,7 +139,7 @@ syntax unop_FXX =
| TRUNC
| NEAREST

;; 1-syntax.watsup:91.1-93.62
;; 1-syntax.watsup:94.1-96.62
syntax binop_IXX =
| ADD
| SUB
Expand All @@ -149,7 +154,7 @@ syntax binop_IXX =
| ROTL
| ROTR

;; 1-syntax.watsup:94.1-94.66
;; 1-syntax.watsup:97.1-97.66
syntax binop_FXX =
| ADD
| SUB
Expand All @@ -159,15 +164,15 @@ syntax binop_FXX =
| MAX
| COPYSIGN

;; 1-syntax.watsup:96.1-96.26
;; 1-syntax.watsup:99.1-99.26
syntax testop_IXX =
| EQZ

;; 1-syntax.watsup:97.1-97.22
;; 1-syntax.watsup:100.1-100.22
syntax testop_FXX =
|

;; 1-syntax.watsup:99.1-100.108
;; 1-syntax.watsup:102.1-103.108
syntax relop_IXX =
| EQ
| NE
Expand All @@ -176,7 +181,7 @@ syntax relop_IXX =
| LE(sx)
| GE(sx)

;; 1-syntax.watsup:101.1-101.49
;; 1-syntax.watsup:104.1-104.49
syntax relop_FXX =
| EQ
| NE
Expand All @@ -185,44 +190,44 @@ syntax relop_FXX =
| LE
| GE

;; 1-syntax.watsup:103.1-103.50
;; 1-syntax.watsup:106.1-106.50
syntax unop_numtype =
| _I(unop_IXX)
| _F(unop_FXX)

;; 1-syntax.watsup:104.1-104.53
;; 1-syntax.watsup:107.1-107.53
syntax binop_numtype =
| _I(binop_IXX)
| _F(binop_FXX)

;; 1-syntax.watsup:105.1-105.56
;; 1-syntax.watsup:108.1-108.56
syntax testop_numtype =
| _I(testop_IXX)
| _F(testop_FXX)

;; 1-syntax.watsup:106.1-106.53
;; 1-syntax.watsup:109.1-109.53
syntax relop_numtype =
| _I(relop_IXX)
| _F(relop_FXX)

;; 1-syntax.watsup:107.1-107.39
;; 1-syntax.watsup:110.1-110.39
syntax cvtop =
| CONVERT
| REINTERPRET

;; 1-syntax.watsup:117.1-117.23
;; 1-syntax.watsup:120.1-120.23
syntax c_numtype = nat

;; 1-syntax.watsup:118.1-118.23
;; 1-syntax.watsup:121.1-121.23
syntax c_vectype = nat

;; 1-syntax.watsup:121.1-121.52
;; 1-syntax.watsup:124.1-124.52
syntax blocktype = functype

;; 1-syntax.watsup:156.1-177.80
;; 1-syntax.watsup:159.1-180.80
rec {

;; 1-syntax.watsup:156.1-177.80
;; 1-syntax.watsup:159.1-180.80
syntax instr =
| UNREACHABLE
| NOP
Expand Down Expand Up @@ -270,53 +275,53 @@ syntax instr =
| STORE(numtype, n?, u32, u32)
}

;; 1-syntax.watsup:179.1-180.9
;; 1-syntax.watsup:182.1-183.9
syntax expr = instr*

;; 1-syntax.watsup:187.1-187.50
;; 1-syntax.watsup:190.1-190.50
syntax elemmode =
| TABLE(tableidx, expr)
| DECLARE

;; 1-syntax.watsup:188.1-188.39
;; 1-syntax.watsup:191.1-191.39
syntax datamode =
| MEMORY(memidx, expr)

;; 1-syntax.watsup:190.1-191.30
;; 1-syntax.watsup:193.1-194.30
syntax func = `FUNC%%*%`(functype, valtype*, expr)

;; 1-syntax.watsup:192.1-193.25
;; 1-syntax.watsup:195.1-196.25
syntax global = GLOBAL(globaltype, expr)

;; 1-syntax.watsup:194.1-195.18
;; 1-syntax.watsup:197.1-198.18
syntax table = TABLE(tabletype)

;; 1-syntax.watsup:196.1-197.17
;; 1-syntax.watsup:199.1-200.17
syntax mem = MEMORY(memtype)

;; 1-syntax.watsup:198.1-199.31
;; 1-syntax.watsup:201.1-202.31
syntax elem = `ELEM%%*%?`(reftype, expr*, elemmode?)

;; 1-syntax.watsup:200.1-201.26
;; 1-syntax.watsup:203.1-204.26
syntax data = `DATA(*)%*%?`(byte**, datamode?)

;; 1-syntax.watsup:202.1-203.16
;; 1-syntax.watsup:205.1-206.16
syntax start = START(funcidx)

;; 1-syntax.watsup:205.1-206.65
;; 1-syntax.watsup:208.1-209.65
syntax externuse =
| FUNC(funcidx)
| GLOBAL(globalidx)
| TABLE(tableidx)
| MEMORY(memidx)

;; 1-syntax.watsup:207.1-208.24
;; 1-syntax.watsup:210.1-211.24
syntax export = EXPORT(name, externuse)

;; 1-syntax.watsup:209.1-210.30
;; 1-syntax.watsup:212.1-213.30
syntax import = IMPORT(name, name, externtype)

;; 1-syntax.watsup:212.1-213.70
;; 1-syntax.watsup:215.1-216.70
syntax module = `MODULE%*%*%*%*%*%*%*%*%*`(import*, func*, global*, table*, mem*, elem*, data*, start*, export*)

;; 2-aux.watsup:3.1-3.14
Expand Down Expand Up @@ -658,15 +663,15 @@ relation Instr_ok: `%|-%:%`(context, instr, functype)
`%|-%:%`(C, LOCAL.TEE_instr(x), `%->%`([t], [t]))
-- if (C.LOCAL_context[x] = t)

;; 3-typing.watsup:281.1-283.29
rule global.get {C : context, t : valtype, x : idx}:
;; 3-typing.watsup:281.1-283.27
rule global.get {C : context, mf : mutflag, t : valtype, x : idx}:
`%|-%:%`(C, GLOBAL.GET_instr(x), `%->%`([], [t]))
-- if (C.GLOBAL_context[x] = `MUT%?%`(()?{}, t))
-- if (C.GLOBAL_context[x] = `%%`(mf, t))

;; 3-typing.watsup:285.1-287.28
rule global.set {C : context, t : valtype, x : idx}:
`%|-%:%`(C, GLOBAL.SET_instr(x), `%->%`([t], []))
-- if (C.GLOBAL_context[x] = `MUT%?%`(?(()), t))
-- if (C.GLOBAL_context[x] = `%%`(MUT_mutflag, t))

;; 3-typing.watsup:290.1-292.28
rule table.get {C : context, lim : limits, rt : reftype, x : idx}:
Expand Down Expand Up @@ -803,10 +808,10 @@ relation Instr_const: `%|-%CONST`(context, instr)
rule ref.func {C : context, x : idx}:
`%|-%CONST`(C, REF.FUNC_instr(x))

;; 3-typing.watsup:380.1-382.32
;; 3-typing.watsup:380.1-382.30
rule global.get {C : context, t : valtype, x : idx}:
`%|-%CONST`(C, GLOBAL.GET_instr(x))
-- if (C.GLOBAL_context[x] = `MUT%?%`(?(), t))
-- if (C.GLOBAL_context[x] = `%%`(IMMUT_mutflag, t))

;; 3-typing.watsup:368.1-368.77
relation Expr_const: `%|-%CONST`(context, expr)
Expand Down Expand Up @@ -835,10 +840,10 @@ relation Func_ok: `%|-%:%`(context, func, functype)
;; 3-typing.watsup:398.1-398.75
relation Global_ok: `%|-%:%`(context, global, globaltype)
;; 3-typing.watsup:414.1-418.40
rule _ {C : context, expr : expr, gt : globaltype, t : valtype}:
rule _ {C : context, expr : expr, gt : globaltype, mf : mutflag, t : valtype}:
`%|-%:%`(C, GLOBAL(gt, expr), gt)
-- Globaltype_ok: `|-%:OK`(gt)
-- if (gt = `MUT%?%`(()?{}, t))
-- if (gt = `%%`(mf, t))
-- Expr_ok_const: `%|-%:%CONST`(C, expr, t)

;; 3-typing.watsup:399.1-399.74
Expand Down Expand Up @@ -1684,7 +1689,8 @@ $$
\begin{array}{@{}lrrl@{}}
\mbox{(result type)} & \mathit{resulttype} &::=& {\mathit{valtype}^\ast} \\
\mbox{(limits)} & \mathit{limits} &::=& [\mathit{u{\scriptstyle32}} .. \mathit{u{\scriptstyle32}}] \\
\mbox{(global type)} & \mathit{globaltype} &::=& {\mathsf{mut}^?}~\mathit{valtype} \\
\mbox{(mutability flag)} & \mathit{mutflag} &::=& \mathsf{mut} ~|~ \mathsf{immut} \\
\mbox{(global type)} & \mathit{globaltype} &::=& \mathit{mutflag}~\mathit{valtype} \\
\mbox{(function type)} & \mathit{functype} &::=& \mathit{resulttype} \rightarrow \mathit{resulttype} \\
\mbox{(table type)} & \mathit{tabletype} &::=& \mathit{limits}~\mathit{reftype} \\
\mbox{(memory type)} & \mathit{memtype} &::=& \mathit{limits}~\mathsf{i{\scriptstyle8}} \\
Expand Down Expand Up @@ -2564,7 +2570,7 @@ $$
$$
\begin{array}{@{}c@{}}\displaystyle
\frac{
\mathit{C}.\mathsf{global}[\mathit{x}] = {\mathsf{mut}^?}~\mathit{t}
\mathit{C}.\mathsf{global}[\mathit{x}] = \mathit{mf}~\mathit{t}
}{
\mathit{C} \vdash \mathsf{global.get}~\mathit{x} : \epsilon \rightarrow \mathit{t}
} \, {[\textsc{\scriptsize T{-}global.get}]}
Expand Down Expand Up @@ -2822,7 +2828,7 @@ $$
$$
\begin{array}{@{}c@{}}\displaystyle
\frac{
\mathit{C}.\mathsf{global}[\mathit{x}] = \epsilon~\mathit{t}
\mathit{C}.\mathsf{global}[\mathit{x}] = \mathsf{immut}~\mathit{t}
}{
\mathit{C} \vdash (\mathsf{global.get}~\mathit{x})~\mathsf{const}
} \, {[\textsc{\scriptsize C{-}instr{-}global.get}]}
Expand Down Expand Up @@ -2900,7 +2906,7 @@ $$
\frac{
{ \vdash }\;\mathit{gt} : \mathsf{ok}
\qquad
\mathit{gt} = {\mathsf{mut}^?}~\mathit{t}
\mathit{gt} = \mathit{mf}~\mathit{t}
\qquad
\mathit{C} \vdash \mathit{expr} : \mathit{t}~\mathsf{const}
}{
Expand Down
1 change: 1 addition & 0 deletions spectec/test-latex/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ warning: syntax `memidx` was never spliced
warning: syntax `meminst` was never spliced
warning: syntax `module` was never spliced
warning: syntax `moduleinst` was never spliced
warning: syntax `mutflag` was never spliced
warning: syntax `n` was never spliced
warning: syntax `name` was never spliced
warning: syntax `num` was never spliced
Expand Down
Loading