github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-16 02:24:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing string keys in pattern matching on objects (ticket 325)

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-04-25 11:07:09 -04:00
parent 212ad45be4
commit 08c877ec7b
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/nodes.js
View File

@@ -1,5 +1,5 @@
(function(){ (function(){
var AccessorNode, ArrayNode, AssignNode, BaseNode, CallNode, ClassNode, ClosureNode, CodeNode, CommentNode, CurryNode, ExistenceNode, Expressions, ExtendsNode, ForNode, IDENTIFIER, IfNode, IndexNode, LiteralNode, ObjectNode, OpNode, ParentheticalNode, PushNode, RangeNode, ReturnNode, Scope, SliceNode, SplatNode, TAB, TRAILING_WHITESPACE, ThrowNode, TryNode, UTILITIES, ValueNode, WhileNode, compact, del, flatten, helpers, literal, merge, statement, utility; var AccessorNode, ArrayNode, AssignNode, BaseNode, CallNode, ClassNode, ClosureNode, CodeNode, CommentNode, CurryNode, ExistenceNode, Expressions, ExtendsNode, ForNode, IDENTIFIER, IS_STRING, IfNode, IndexNode, LiteralNode, ObjectNode, OpNode, ParentheticalNode, PushNode, RangeNode, ReturnNode, Scope, SliceNode, SplatNode, TAB, TRAILING_WHITESPACE, ThrowNode, TryNode, UTILITIES, ValueNode, WhileNode, compact, del, flatten, helpers, literal, merge, statement, utility;
var __extends = function(child, parent) { var __extends = function(child, parent) {
var ctor = function(){ }; var ctor = function(){ };
ctor.prototype = parent.prototype; ctor.prototype = parent.prototype;
@@ -927,7 +927,7 @@
// See the [ECMAScript Harmony Wiki](http://wiki.ecmascript.org/doku.php?id=harmony:destructuring) // See the [ECMAScript Harmony Wiki](http://wiki.ecmascript.org/doku.php?id=harmony:destructuring)
// for details. // for details.
AssignNode.prototype.compile_pattern_match = function compile_pattern_match(o) { AssignNode.prototype.compile_pattern_match = function compile_pattern_match(o) {
var _a, _b, _c, access_class, assigns, code, i, idx, obj, oindex, olength, splat, val, val_var, value; var _a, _b, _c, access_class, assigns, code, i, idx, is_string, obj, oindex, olength, splat, val, val_var, value;
val_var = o.scope.free_variable(); val_var = o.scope.free_variable();
value = this.value.is_statement() ? ClosureNode.wrap(this.value) : this.value; value = this.value.is_statement() ? ClosureNode.wrap(this.value) : this.value;
assigns = [("" + this.tab + val_var + " = " + (value.compile(o)) + ";")]; assigns = [("" + this.tab + val_var + " = " + (value.compile(o)) + ";")];
@@ -943,7 +943,8 @@
obj = _c[0]; obj = _c[0];
idx = _c[1]; idx = _c[1];
} }
access_class = this.variable.is_array() ? IndexNode : AccessorNode; is_string = idx.value && idx.value.match(IS_STRING);
access_class = is_string || this.variable.is_array() ? IndexNode : AccessorNode;
if (obj instanceof SplatNode && !splat) { if (obj instanceof SplatNode && !splat) {
val = literal(obj.compile_value(o, val_var, (oindex = this.variable.base.objects.indexOf(obj)), (olength = this.variable.base.objects.length) - oindex - 1)); val = literal(obj.compile_value(o, val_var, (oindex = this.variable.base.objects.indexOf(obj)), (olength = this.variable.base.objects.length) - oindex - 1));
splat = true; splat = true;
@@ -1755,6 +1756,8 @@
TRAILING_WHITESPACE = /\s+$/gm; TRAILING_WHITESPACE = /\s+$/gm;
// Keep this identifier regex in sync with the Lexer. // Keep this identifier regex in sync with the Lexer.
IDENTIFIER = /^[a-zA-Z\$_](\w|\$)*$/; IDENTIFIER = /^[a-zA-Z\$_](\w|\$)*$/;
// Is a literal value a string?
IS_STRING = /^['"]/;
// Utility Functions // Utility Functions
// ----------------- // -----------------
// Handy helper for a generating LiteralNode. // Handy helper for a generating LiteralNode.

6
src/nodes.coffee
View File

@@ -692,7 +692,8 @@ exports.AssignNode: class AssignNode extends BaseNode
for obj, i in @variable.base.objects for obj, i in @variable.base.objects
idx: i idx: i
[obj, idx]: [obj.value, obj.variable.base] if @variable.is_object() [obj, idx]: [obj.value, obj.variable.base] if @variable.is_object()
access_class: if @variable.is_array() then IndexNode else AccessorNode is_string: idx.value and idx.value.match IS_STRING
access_class: if is_string or @variable.is_array() then IndexNode else AccessorNode
if obj instanceof SplatNode and not splat if obj instanceof SplatNode and not splat
val: literal(obj.compile_value(o, val_var, val: literal(obj.compile_value(o, val_var,
(oindex: @variable.base.objects.indexOf(obj)), (oindex: @variable.base.objects.indexOf(obj)),
@@ -1331,6 +1332,9 @@ TRAILING_WHITESPACE: /\s+$/gm
# Keep this identifier regex in sync with the Lexer. # Keep this identifier regex in sync with the Lexer.
IDENTIFIER: /^[a-zA-Z\$_](\w|\$)*$/ IDENTIFIER: /^[a-zA-Z\$_](\w|\$)*$/
# Is a literal value a string?
IS_STRING: /^['"]/
# Utility Functions # Utility Functions
# ----------------- # -----------------

4
test/test_pattern_matching.coffee
View File

@@ -56,7 +56,7 @@ ok c is 30
person: { person: {
name: "Moe" name: "Moe"
family: { family: {
brother: { 'elder-brother': {
addresses: [ addresses: [
"first" "first"
{ {
@@ -68,7 +68,7 @@ person: {
} }
} }
{name: a, family: {brother: {addresses: [one, {city: b}]}}}: person {name: a, family: {'elder-brother': {addresses: [one, {city: b}]}}}: person
ok a is "Moe" ok a is "Moe"
ok b is "Moquasset NY, 10021" ok b is "Moquasset NY, 10021"