kotovalexarian-likes-github
/
jashkenas--coffeescript
mirror of https://github.com/jashkenas/coffeescript.git
1
0
Fork 0
Code Releases Activity

Revert "removing yytext mentions from the grammar" 

This reverts commit 5957b9f155.
This commit is contained in:
Jeremy Ashkenas 2010-04-21 23:10:45 -04:00
parent 5957b9f155
commit bc0ec9dc07
1 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/grammar.coffee
View File

@ -76,8 +76,8 @@ grammar: {
Statement: [ Statement: [
o "Return" o "Return"
o "Throw" o "Throw"
o "BREAK", -> new LiteralNode $1 o "BREAK", -> new LiteralNode yytext
o "CONTINUE", -> new LiteralNode $1 o "CONTINUE", -> new LiteralNode yytext
] ]
# All the different types of expressions in our language. The basic unit of # All the different types of expressions in our language. The basic unit of
@ -100,8 +100,8 @@ grammar: {
o "Class" o "Class"
o "Splat" o "Splat"
o "Existence" o "Existence"
o "COMMENT" o "Comment"
o "EXTENSION" o "Extension"
] ]
# A an indented block of expressions. Note that the [Rewriter](rewriter.html) # A an indented block of expressions. Note that the [Rewriter](rewriter.html)
@ -110,22 +110,27 @@ grammar: {
Block: [ Block: [
o "INDENT Body OUTDENT", -> $2 o "INDENT Body OUTDENT", -> $2
o "INDENT OUTDENT", -> new Expressions() o "INDENT OUTDENT", -> new Expressions()
o "TERMINATOR COMMENT", -> Expressions.wrap [$2] o "TERMINATOR Comment", -> Expressions.wrap [$2]
]
# A literal identifier, a variable name or property.
Identifier: [
o "IDENTIFIER", -> new LiteralNode yytext
] ]
# Alphanumerics are separated from the other **Literal** matchers because # Alphanumerics are separated from the other **Literal** matchers because
# they can also serve as keys in object literals. # they can also serve as keys in object literals.
AlphaNumeric: [ AlphaNumeric: [
o "NUMBER", -> new LiteralNode $1 o "NUMBER", -> new LiteralNode yytext
o "STRING", -> new LiteralNode $1 o "STRING", -> new LiteralNode yytext
] ]
# All of our immediate values. These can (in general), be passed straight # All of our immediate values. These can (in general), be passed straight
# through and printed to JavaScript. # through and printed to JavaScript.
Literal: [ Literal: [
o "AlphaNumeric" o "AlphaNumeric"
o "JS", -> new LiteralNode $1 o "JS", -> new LiteralNode yytext
o "REGEX", -> new LiteralNode $1 o "REGEX", -> new LiteralNode yytext
o "TRUE", -> new LiteralNode true o "TRUE", -> new LiteralNode true
o "FALSE", -> new LiteralNode false o "FALSE", -> new LiteralNode false
o "YES", -> new LiteralNode true o "YES", -> new LiteralNode true
@ -142,9 +147,9 @@ grammar: {
# Assignment when it happens within an object literal. The difference from # Assignment when it happens within an object literal. The difference from
# the ordinary **Assign** is that these allow numbers and strings as keys. # the ordinary **Assign** is that these allow numbers and strings as keys.
AssignObj: [ AssignObj: [
o "IDENTIFIER ASSIGN Expression", -> new AssignNode new ValueNode($1), $3, 'object' o "Identifier ASSIGN Expression", -> new AssignNode new ValueNode($1), $3, 'object'
o "AlphaNumeric ASSIGN Expression", -> new AssignNode new ValueNode($1), $3, 'object' o "AlphaNumeric ASSIGN Expression", -> new AssignNode new ValueNode($1), $3, 'object'
o "COMMENT" o "Comment"
] ]
# A return statement from a function body. # A return statement from a function body.
@ -153,6 +158,13 @@ grammar: {
o "RETURN", -> new ReturnNode new ValueNode new LiteralNode 'null' o "RETURN", -> new ReturnNode new ValueNode new LiteralNode 'null'
] ]
# A comment. Because CoffeeScript passes comments through to JavaScript, we
# have to parse comments like any other construct, and identify all of the
# positions in which they can occur in the grammar.
Comment: [
o "COMMENT", -> new CommentNode yytext
]
# [The existential operator](http://jashkenas.github.com/coffee-script/#existence). # [The existential operator](http://jashkenas.github.com/coffee-script/#existence).
Existence: [ Existence: [
o "Expression ?", -> new ExistenceNode $1 o "Expression ?", -> new ExistenceNode $1
@ -183,8 +195,8 @@ grammar: {
# A single parameter in a function definition can be ordinary, or a splat # A single parameter in a function definition can be ordinary, or a splat
# that hoovers up the remaining arguments. # that hoovers up the remaining arguments.
Param: [ Param: [
o "PARAM", -> new LiteralNode $1 o "PARAM", -> new LiteralNode yytext
o "PARAM . . .", -> new SplatNode $1 o "Param . . .", -> new SplatNode $1
] ]
# A splat that occurs outside of a parameter list. # A splat that occurs outside of a parameter list.
@ -194,7 +206,7 @@ grammar: {
# Variables and properties that can be assigned to. # Variables and properties that can be assigned to.
SimpleAssignable: [ SimpleAssignable: [
o "IDENTIFIER", -> new ValueNode $1 o "Identifier", -> new ValueNode $1
o "Value Accessor", -> $1.push $2 o "Value Accessor", -> $1.push $2
o "Invocation Accessor", -> new ValueNode $1, [$2] o "Invocation Accessor", -> new ValueNode $1, [$2]
o "ThisProperty" o "ThisProperty"
@ -221,10 +233,10 @@ grammar: {
# The general group of accessors into an object, by property, by prototype # The general group of accessors into an object, by property, by prototype
# or by array index or slice. # or by array index or slice.
Accessor: [ Accessor: [
o "PROPERTY_ACCESS IDENTIFIER", -> new AccessorNode $2 o "PROPERTY_ACCESS Identifier", -> new AccessorNode $2
o "PROTOTYPE_ACCESS IDENTIFIER", -> new AccessorNode $2, 'prototype' o "PROTOTYPE_ACCESS Identifier", -> new AccessorNode $2, 'prototype'
o "::", -> new AccessorNode(new LiteralNode('prototype')) o "::", -> new AccessorNode(new LiteralNode('prototype'))
o "SOAK_ACCESS IDENTIFIER", -> new AccessorNode $2, 'soak' o "SOAK_ACCESS Identifier", -> new AccessorNode $2, 'soak'
o "Index" o "Index"
o "Slice", -> new SliceNode $1 o "Slice", -> new SliceNode $1
] ]
@ -326,7 +338,7 @@ grammar: {
# A reference to a property on *this*. # A reference to a property on *this*.
ThisProperty: [ ThisProperty: [
o "@ IDENTIFIER", -> new ValueNode new LiteralNode('this'), [new AccessorNode($2)] o "@ Identifier", -> new ValueNode new LiteralNode('this'), [new AccessorNode($2)]
] ]
# The CoffeeScript range literal. # The CoffeeScript range literal.
@ -380,7 +392,7 @@ grammar: {
# A catch clause names its error and runs a block of code. # A catch clause names its error and runs a block of code.
Catch: [ Catch: [
o "CATCH IDENTIFIER Block", -> [$2, $3] o "CATCH Identifier Block", -> [$2, $3]
] ]
# Throw an exception object. # Throw an exception object.
@ -396,6 +408,12 @@ grammar: {
o "( Line )", -> new ParentheticalNode $2 o "( Line )", -> new ParentheticalNode $2
] ]
# A language extension to CoffeeScript from the outside. We simply pass
# it through unaltered.
Extension: [
o "EXTENSION", -> yytext
]
# The condition portion of a while loop. # The condition portion of a while loop.
WhileSource: [ WhileSource: [
o "WHILE Expression", -> new WhileNode $2 o "WHILE Expression", -> new WhileNode $2
@ -423,8 +441,8 @@ grammar: {
# (optional) reference to the current index. Or, *key, value*, in the case # (optional) reference to the current index. Or, *key, value*, in the case
# of object comprehensions. # of object comprehensions.
ForVariables: [ ForVariables: [
o "IDENTIFIER", -> [$1] o "Identifier", -> [$1]
o "IDENTIFIER , IDENTIFIER", -> [$1, $3] o "Identifier , Identifier", -> [$1, $3]
] ]
# The source of a comprehension is an array or object with an optional filter # The source of a comprehension is an array or object with an optional filter
@ -458,7 +476,7 @@ grammar: {
When: [ When: [
o "LEADING_WHEN SimpleArgs Block", -> new IfNode $2, $3, null, {statement: true} o "LEADING_WHEN SimpleArgs Block", -> new IfNode $2, $3, null, {statement: true}
o "LEADING_WHEN SimpleArgs Block TERMINATOR", -> new IfNode $2, $3, null, {statement: true} o "LEADING_WHEN SimpleArgs Block TERMINATOR", -> new IfNode $2, $3, null, {statement: true}
o "COMMENT TERMINATOR When", -> $3.comment: $1; $3 o "Comment TERMINATOR When", -> $3.comment: $1; $3
] ]
# The most basic form of *if* is a condition and an action. The following # The most basic form of *if* is a condition and an action. The following