summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2017-01-26 23:50:48 -0800
committerOri Bernstein <ori@eigenstate.org>2017-01-26 23:50:48 -0800
commit31ed0906c7d3191c81ae5e0f35b91ed9518e22c3 (patch)
treee8dd2e396c48cce865153dd6e888983ab418a2ae /doc
parentbccf958a86c52a27db9fab3f85f159ddc34629e8 (diff)
downloadmc-31ed0906c7d3191c81ae5e0f35b91ed9518e22c3.tar.gz
Fix comment descriptions.
Diffstat (limited to 'doc')
-rw-r--r--doc/lang.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/lang.txt b/doc/lang.txt
index 3722590..05b7438 100644
--- a/doc/lang.txt
+++ b/doc/lang.txt
@@ -56,7 +56,7 @@ TABLE OF CONTENTS:
Syntax is defined using an informal variant of EBNF.
- token: /regex/ | "quoted" | <english description>
+ token: /regex/ | "quoted" | <informal description>
prod: prodname ":" expr*
expr: alt ( "|" alt )*
alt: term term*
@@ -99,6 +99,13 @@ TABLE OF CONTENTS:
/* this is a comment /* with another inside */ */
+ Alternatively, '//' may be used to denote a comment. This comment
+ will extend to the end of the current line. Newlines within a line
+ comment may not be escaped.
+
+ // this is a line comment
+ // it will end on this line, regardless of the trailing \
+
Identifiers begin with any alphabetic character or underscore, and
continue with alphanumeric characters or underscores. Currently the
compiler places a limit of 1024 bytes on the length of the identifier.
@@ -596,8 +603,6 @@ TABLE OF CONTENTS:
side of the of the expression are unified with this freshened
type equation.
-
-
4.7.3. Delayed Unification
In order to allow for the assignment of literals to defined types,