type fixes and bindings + notes on subtyping
This commit is contained in:
parent
7e3c7c88ea
commit
c18f56f7be
28 changed files with 2253 additions and 783 deletions
|
|
@ -1,33 +0,0 @@
|
|||
#ifndef _MSPH_DECOR_H
|
||||
#define _MSPH_DECOR_H
|
||||
|
||||
struct msph_tp_decor {
|
||||
struct spho_tp *tp;
|
||||
};
|
||||
|
||||
#define TP_DECOR_INIT(ptr) \
|
||||
do { \
|
||||
(ptr)->tp = NULL; \
|
||||
} while (0)
|
||||
|
||||
struct msph_scope_decor {
|
||||
struct spho_scope *sc;
|
||||
};
|
||||
|
||||
#define SCOPE_DECOR_INIT(ptr) \
|
||||
do { \
|
||||
(ptr)->sc = NULL; \
|
||||
} while (0)
|
||||
|
||||
struct msph_nom_decor {
|
||||
struct spho_nom *nom;
|
||||
};
|
||||
|
||||
#define NOM_DECOR_INIT(ptr) \
|
||||
do { \
|
||||
(ptr)->nom = NULL; \
|
||||
} while (0)
|
||||
|
||||
#define GET_SCOPE(ptr) ((ptr)->dec.sc)
|
||||
|
||||
#endif /* _MSPH_DECOR_H */
|
||||
|
|
@ -7,6 +7,7 @@ int msph_sphophi_init(struct msph_tree_root *);
|
|||
int msph_sphophi_scope(struct msph_tree_root *);
|
||||
int msph_sphophi_nom_lookup(struct msph_tree_root *);
|
||||
int msph_sphophi_tp(struct msph_tree_root *);
|
||||
int msph_sphophi_tp_prebind(struct msph_tree_root *);
|
||||
|
||||
int msph_sphophi(struct msph_tree_root *);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,56 +5,13 @@
|
|||
|
||||
#include "msph/common.h"
|
||||
#include "msph/token.h"
|
||||
#include "msph/decor.h"
|
||||
|
||||
/*
|
||||
* TYPES:
|
||||
* Conj
|
||||
* Disj
|
||||
* Impl
|
||||
* Arrow
|
||||
* Box
|
||||
* (Sub)
|
||||
* Forall
|
||||
*
|
||||
* True
|
||||
* False
|
||||
* Var
|
||||
* Nominal
|
||||
*
|
||||
* Record
|
||||
*
|
||||
* DEFINITIONS/DIRECTIVES:
|
||||
* Type definition (type A[X..] = T)
|
||||
* Nominal definition (nominal N)
|
||||
* Member definition (member mname : T)
|
||||
*
|
||||
* {
|
||||
* member a: A
|
||||
* member b: B
|
||||
* }
|
||||
*
|
||||
* Subtyping assert (assert A <: B, asserts that A <: B)
|
||||
*
|
||||
* EXTRA DEFINITIONS
|
||||
* Class definition (class C[...] { ... }, shorthand)
|
||||
*
|
||||
* EXPRESSIONS
|
||||
* Conj
|
||||
* Disj
|
||||
* Impl
|
||||
* Arrow
|
||||
* Box
|
||||
* (Sub)
|
||||
* Forall
|
||||
*
|
||||
* True
|
||||
* False
|
||||
* Var
|
||||
* Nominal
|
||||
*
|
||||
* Trait ({ ... }, creates scoping)
|
||||
*/
|
||||
/* tree decorations */
|
||||
struct msph_decor {
|
||||
struct spho_scope *sc;
|
||||
struct spho_tp *tp;
|
||||
struct spho_nom *nom;
|
||||
};
|
||||
|
||||
#define MSPH_TREE_ROOT 0x0000
|
||||
#define MSPH_TREE_UNIT 0x0001
|
||||
|
|
@ -70,8 +27,8 @@
|
|||
#define MSPH_TREE_TPEXPR 0x0040
|
||||
#define MSPH_TREE_TRUE 0x0041
|
||||
#define MSPH_TREE_FALSE 0x0042
|
||||
#define MSPH_TREE_NAME 0x0043
|
||||
#define MSPH_TREE_APPL 0x0044
|
||||
#define MSPH_TREE_TPNAME 0x0043
|
||||
#define MSPH_TREE_TPAPPL 0x0044
|
||||
#define MSPH_TREE_TRAIT 0x0045
|
||||
#define MSPH_TREE_CONJ 0x0046
|
||||
#define MSPH_TREE_DISJ 0x0047
|
||||
|
|
@ -82,11 +39,64 @@
|
|||
#define MSPH_TREE_PAREN 0x004c
|
||||
|
||||
#define MSPH_TREE_IDENT 0x0100
|
||||
#define MSPH_TREE_NAMEDECL 0x0101
|
||||
#define MSPH_TREE_NAMEREF 0x0102
|
||||
|
||||
#define MSPH_TREE_FLAG_OFFSET 16
|
||||
|
||||
#define MSPH_TREE_FLAG_SCOPE (1 << (MSPH_TREE_FLAG_OFFSET))
|
||||
#define MSPH_TREE_FLAG_TP (1 << (MSPH_TREE_FLAG_OFFSET + 1))
|
||||
#define MSPH_TREE_FLAG_NOM (1 << (MSPH_TREE_FLAG_OFFSET + 2))
|
||||
|
||||
#define MSPH_TREE_MASK_FLAGS ((~0x0u) << MSPH_TREE_FLAG_OFFSET)
|
||||
#define MSPH_TREE_MASK_ID ((~0x0u) ^ MSPH_TREE_MASK_FLAGS)
|
||||
|
||||
#define ADD_FLAG(tree, flag) \
|
||||
do { \
|
||||
TREE(tree)->type |= flag; \
|
||||
} while (0)
|
||||
#define HAS_FLAG(tree, flag) (TREE(tree)->type & (flag))
|
||||
|
||||
#define TREE(tree) ((struct msph_tree *)tree)
|
||||
#define TEXT(tree) ((struct msph_tree_text *)tree)
|
||||
#define IDENT(tree) ((struct msph_tree_ident *)tree)
|
||||
#define TPEXPR(tree) ((struct msph_tree_tpexpr *)tree)
|
||||
|
||||
#define HAS_SCOPE(tree) HAS_FLAG((tree), MSPH_TREE_FLAG_SCOPE)
|
||||
#define HAS_TP(tree) HAS_FLAG((tree), MSPH_TREE_FLAG_TP)
|
||||
#define HAS_NOM(tree) HAS_FLAG((tree), MSPH_TREE_FLAG_NOM)
|
||||
|
||||
#define HAS_PARAMS(tpdef) (! STAILQ_EMPTY(&(tpdef)->params))
|
||||
|
||||
#define TREE_ID(tree) (((struct msph_tree *)tree)->type & \
|
||||
MSPH_TREE_MASK_ID)
|
||||
|
||||
#define DECOR(tree) (TREE(tree)->decor)
|
||||
#define SCOPE(tree) (TREE(tree)->decor.sc)
|
||||
#define TP(tree) (TREE(tree)->decor.tp)
|
||||
#define NOM(tree) (TREE(tree)->decor.nom)
|
||||
|
||||
#define DECOR_INIT(tree) \
|
||||
do { \
|
||||
DECOR(tree) = (struct msph_decor) { NULL, NULL, NULL }; \
|
||||
} while (0)
|
||||
|
||||
struct msph_tree {
|
||||
int type;
|
||||
unsigned int type;
|
||||
struct msph_tree *parent;
|
||||
struct msph_decor decor;
|
||||
};
|
||||
|
||||
|
||||
struct msph_tree_text {
|
||||
struct msph_tree hd_tr;
|
||||
struct msph_text_pos pos;
|
||||
};
|
||||
|
||||
struct msph_tree_ident {
|
||||
struct msph_tree_text hd_txt;
|
||||
|
||||
char str[MSPH_IDENT_LEN];
|
||||
};
|
||||
|
||||
struct msph_tree_root;
|
||||
|
|
@ -100,7 +110,7 @@ struct msph_tree_ident;
|
|||
struct msph_tree_tpexpr;
|
||||
|
||||
struct msph_tree_root {
|
||||
struct msph_tree htr;
|
||||
struct msph_tree hd_tr;
|
||||
|
||||
struct msph_ctx *ctx;
|
||||
|
||||
|
|
@ -108,155 +118,144 @@ struct msph_tree_root {
|
|||
};
|
||||
|
||||
struct msph_tree_unit {
|
||||
struct msph_tree htr;
|
||||
struct msph_tree hd_tr;
|
||||
|
||||
char name[MSPH_NAME_LEN];
|
||||
struct msph_tree_body *body;
|
||||
struct msph_scope_decor dec;
|
||||
|
||||
STAILQ_ENTRY(msph_tree_unit) entries;
|
||||
};
|
||||
|
||||
struct msph_tree_text {
|
||||
struct msph_tree htr;
|
||||
struct msph_text_pos pos;
|
||||
};
|
||||
|
||||
struct msph_tree_body {
|
||||
struct msph_tree htr;
|
||||
struct msph_tree hd_tr;
|
||||
|
||||
STAILQ_HEAD(msph_tree_dir_l, msph_tree_dir) head;
|
||||
};
|
||||
|
||||
struct msph_tree_dir {
|
||||
struct msph_tree_text htxt;
|
||||
struct msph_tree_text hd_txt;
|
||||
|
||||
STAILQ_ENTRY(msph_tree_dir) entries;
|
||||
};
|
||||
|
||||
struct msph_tree_tpdef {
|
||||
struct msph_tree_dir hdir;
|
||||
struct msph_tree_dir hd_dir;
|
||||
|
||||
struct msph_tree_ident *id;
|
||||
struct msph_tree_namedecl *name;
|
||||
STAILQ_HEAD(msph_tree_namedecl_l, msph_tree_namedecl) params;
|
||||
struct msph_tree_tpexpr *tp;
|
||||
};
|
||||
|
||||
struct msph_tree_nomindecl {
|
||||
struct msph_tree_dir hdir;
|
||||
struct msph_tree_dir hd_dir;
|
||||
|
||||
struct msph_tree_ident *id;
|
||||
struct msph_tree_namedecl *name;
|
||||
};
|
||||
|
||||
struct msph_tree_membdecl {
|
||||
struct msph_tree_dir hdir;
|
||||
struct msph_tree_dir hd_dir;
|
||||
|
||||
struct msph_tree_ident *id;
|
||||
struct msph_tree_tpexpr *tp;
|
||||
struct msph_tree_namedecl *name;
|
||||
struct msph_tree_tpexpr *tp;
|
||||
};
|
||||
|
||||
struct msph_tree_assert {
|
||||
struct msph_tree_dir hdir;
|
||||
struct msph_tree_dir hd_dir;
|
||||
|
||||
struct msph_tree_tpexpr *ltp;
|
||||
struct msph_tree_tpexpr *rtp;
|
||||
};
|
||||
|
||||
struct msph_tree_tpexpr {
|
||||
struct msph_tree_text htxt;
|
||||
struct msph_tree_namedecl {
|
||||
struct msph_tree_ident hd_id;
|
||||
|
||||
STAILQ_ENTRY(msph_tree_tpexpr) entries;
|
||||
|
||||
struct msph_tp_decor dec;
|
||||
STAILQ_ENTRY(msph_tree_namedecl) entries;
|
||||
};
|
||||
|
||||
struct msph_tree_tpexpr {
|
||||
struct msph_tree_text hd_txt;
|
||||
|
||||
STAILQ_ENTRY(msph_tree_tpexpr) entries;
|
||||
};
|
||||
|
||||
struct msph_tree_true {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
};
|
||||
|
||||
struct msph_tree_false {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
};
|
||||
|
||||
struct msph_tree_name {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
|
||||
struct msph_tree_ident *id;
|
||||
struct msph_tree_nameref {
|
||||
struct msph_tree_ident hd_id;
|
||||
};
|
||||
|
||||
struct msph_tree_appl {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpname {
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_ident *id;
|
||||
STAILQ_HEAD(msph_tree_tpexpr_l, msph_tree_tpexpr) head;
|
||||
struct msph_tree_nameref *name;
|
||||
};
|
||||
|
||||
struct msph_tree_tpappl {
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_nameref *name;
|
||||
STAILQ_HEAD(msph_tree_tpexpr_l, msph_tree_tpexpr) args;
|
||||
};
|
||||
|
||||
struct msph_tree_trait {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_body *body;
|
||||
|
||||
struct msph_scope_decor dec;
|
||||
};
|
||||
|
||||
struct msph_tree_conj {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_tpexpr *ltp;
|
||||
struct msph_tree_tpexpr *rtp;
|
||||
};
|
||||
|
||||
struct msph_tree_disj {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_tpexpr *ltp;
|
||||
struct msph_tree_tpexpr *rtp;
|
||||
};
|
||||
|
||||
struct msph_tree_impl {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_tpexpr *ltp;
|
||||
struct msph_tree_tpexpr *rtp;
|
||||
};
|
||||
|
||||
struct msph_tree_arrow {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_tpexpr *ltp;
|
||||
struct msph_tree_tpexpr *rtp;
|
||||
};
|
||||
|
||||
struct msph_tree_box {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_tpexpr *inner;
|
||||
};
|
||||
|
||||
struct msph_tree_forall {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_ident *id;
|
||||
struct msph_tree_tpexpr *inner;
|
||||
|
||||
struct msph_scope_decor dec;
|
||||
struct msph_tree_namedecl *name;
|
||||
struct msph_tree_tpexpr *inner;
|
||||
};
|
||||
|
||||
struct msph_tree_paren {
|
||||
struct msph_tree_tpexpr htpe;
|
||||
struct msph_tree_tpexpr hd_tpe;
|
||||
|
||||
struct msph_tree_tpexpr *inner;
|
||||
};
|
||||
|
||||
struct msph_tree_ident {
|
||||
struct msph_tree_text htxt;
|
||||
|
||||
char str[MSPH_IDENT_LEN];
|
||||
STAILQ_ENTRY(msph_tree_ident) entries;
|
||||
|
||||
struct msph_nom_decor dec;
|
||||
};
|
||||
|
||||
|
||||
struct msph_tree_root *msph_tree_makeroot(struct msph_ctx *);
|
||||
|
||||
|
|
@ -264,7 +263,4 @@ int msph_tree_parse(struct msph_token_stream *, struct msph_tree_root *);
|
|||
|
||||
ssize_t msph_tree_fprint(FILE *, struct msph_tree *);
|
||||
|
||||
#define T(ptr) ((struct msph_tree *)ptr)
|
||||
#define TXT(ptr) ((struct msph_tree_text *)ptr)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue