Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
capnproto
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
capnproto
Commits
fa8ca65d
Commit
fa8ca65d
authored
Feb 19, 2013
by
Kenton Varda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reserve 'on'.
parent
edd07d5a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
Lexer.hs
compiler/src/Lexer.hs
+1
-0
Parser.hs
compiler/src/Parser.hs
+1
-0
Token.hs
compiler/src/Token.hs
+2
-1
No files found.
compiler/src/Lexer.hs
View file @
fa8ca65d
...
...
@@ -33,6 +33,7 @@ import Token
keywords
=
[
(
InKeyword
,
"in"
)
,
(
OfKeyword
,
"of"
)
,
(
OnKeyword
,
"on"
)
,
(
AsKeyword
,
"as"
)
,
(
WithKeyword
,
"with"
)
,
(
FromKeyword
,
"from"
)
...
...
compiler/src/Parser.hs
View file @
fa8ca65d
...
...
@@ -49,6 +49,7 @@ tokenErrorString MinusSign = "\"-\""
tokenErrorString
ExclamationPoint
=
"
\"
!
\"
"
tokenErrorString
InKeyword
=
"keyword
\"
in
\"
"
tokenErrorString
OfKeyword
=
"keyword
\"
of
\"
"
tokenErrorString
OnKeyword
=
"keyword
\"
on
\"
"
tokenErrorString
AsKeyword
=
"keyword
\"
as
\"
"
tokenErrorString
WithKeyword
=
"keyword
\"
with
\"
"
tokenErrorString
FromKeyword
=
"keyword
\"
from
\"
"
...
...
compiler/src/Token.hs
View file @
fa8ca65d
...
...
@@ -50,7 +50,8 @@ data Token = Identifier String
|
MinusSign
|
ExclamationPoint
|
InKeyword
|
OfKeyword
|
OfKeyword
-- We reserve some common, short English words for use as future keywords.
|
OnKeyword
|
AsKeyword
|
WithKeyword
|
FromKeyword
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment