Feature #4276: Allow use of quotes in symbol syntactic sugar for hashes

[Tyler Benster]

=begin
Current syntactic sugar allows this:
hash = {Alabama: "AL"}

This feature request is to also allow symbols delimited by quotes (and thus able to contain a whitespace) to use an equivalent syntactic sugar:
hash2 = {"Rhode Island": "RI"}
=end

[Nobuyoshi Nakada]

=begin
Hi,

: At Thu, 13 Jan 2011 10:17:23 +0900,
: Tyler Benster wrote in :

Current syntactic sugar allows this:
hash = {Alabama: "AL"}

This feature request is to also allow symbols delimited by quotes (and thus able to contain a whitespace) to use an equivalent syntactic sugar:
hash2 = {"Rhode Island": "RI"}

I've forgotten to post the patch.

diff --git i/parse.y w/parse.y
index 06f96ce..0cacdd5 100644
--- i/parse.y
+++ w/parse.y
@@ -380,6 +380,8 @@ static NODE retargsgen(struct parser_params,NODE);
static NODE *argblkpass(NODE,NODE);
static NODE *newyieldgen(struct parser_params,NODE);
#define newyield(node) newyieldgen(parser, (node))
+static NODE *dsymnodegen(struct parserparams,NODE*);
+#define dsymnode(node) dsymnode_gen(parser, (node))

static NODE gettablegen(struct parserparams,ID);
#define gettable(id) gettablegen(parser,(id))
@@ -678,12 +680,12 @@ static void tokeninfopop(struct parserparams*, const char *token);
keywordFILE
keywordENCODING

-%token tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR tLABEL
+%token tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR tLABEL tLABELEND
%token tINTEGER tFLOAT tSTRINGCONTENT tCHAR
%token tNTHREF tBACKREF
%token tREGEXP_END

-%type singleton strings string string1 xstring regexp
+%type singleton strings string string1 xstring regexp stringbody
%type stringcontents xstringcontents regexpcontents stringcontent
%type words qwords wordlist qword_list word
%type literal numeric dsym cpath
@@ -3841,12 +3843,18 @@ string : tCHAR
}
;

-string1 : tSTRINGBEG stringcontents tSTRINGEND
+stringbody : tSTRINGBEG stringcontents
{
- /%%%/
$$ = $2;
+ }
+ ;
+
+string1 : stringbody tSTRINGEND
+ {
+ /%%%/
+ $$ = $1;
/%
- $$ = dispatch1(stringliteral, $2);
+ $$ = dispatch1(stringliteral, $1);
%/
}
;
@@ -4199,26 +4207,7 @@ dsym : tSYMBEG xstringcontents tSTRINGEND
{
lexstate = EXPREND;
/%%%/
- if (!($$ = $2)) {
- $$ = NEWLIT(ID2SYM(rbintern("")));
- }
- else {
- VALUE lit;
-
- switch (ndtype($$)) {
- case NODEDSTR:
- ndsettype($$, NODEDSYM);
- break;
- case NODESTR:
- lit = $$->ndlit;
- $$->ndlit = ID2SYM(rbinternstr(lit));
- ndsettype($$, NODELIT);
- break;
- default:
- $$ = NEWNODE(NODEDSYM, Qnil, 1, NEWLIST($$));
- break;
- }
- }
+ $$ = dsymnode($2);
/*%
$$ = dispatch1(dynasymbol, $2);
%/
@@ -4761,6 +4750,15 @@ assoc : argvalue tASSOC argvalue
$$ = dispatch2(assoc_new, $1, $2);
%/
}
+ | stringbody tLABELEND argvalue
+ {
+ /%%%/
+ $$ = listappend(NEWLIST(dsymnode($1)), $3);
+ /%
+ $$ = dispatch1(dynasymbol, $1);
+ $$ = dispatch2(assocnew, $$, $3);
+ %/
+ }
;

operation : tIDENTIFIER
@@ -5334,6 +5332,7 @@ rbparsercompilefile(volatile VALUE vparser, const char *f, VALUE file, int st
#define STRFUNCQWORDS 0x08
#define STRFUNCSYMBOL 0x10
#define STRFUNCINDENT 0x20
+#define STRFUNC_LABEL 0x40

enum stringtype {
strsquote = (0),
@@ -5925,6 +5924,8 @@ parsertokaddstring(struct parser_params *parser,

#define NEWSTRTERM(func, term, paren) \
rbnodenewnode(NODESTRTERM, (func), (term) | ((paren) << (CHARBIT * 2)), 0)
+#define ISLABELSUFFIX(n) (peekn(':',(n)) && !peekn(':', (n)+1))
+#define MAYBELABEL() (ISLABELPOSSIBLE() ? STRFUNCLABEL : 0)

static int
parserparsestring(struct parserparams *parser, NODE *quote)
@@ -5946,6 +5947,10 @@ parserparsestring(struct parserparams *parser, NODE *quote)
quote->ndfunc = -1;
return ' ';
}
+ if ((func & STRFUNCLABEL) && ISLABELSUFFIX(0)) {
+ lexstate = EXPRBEG;
+ return tLABELEND;
+ }
if (!(func & STRFUNCREGEXP)) return tSTRINGEND;
setyylvalnum(regxoptions());
return tREGEXPEND;
@@ -6533,7 +6538,6 @@ parserprepare(struct parserparams *parser)
#define ISBEG() (lexstate == EXPRBEG || lexstate == EXPRMID || lexstate == EXPRVALUE || lexstate == EXPRCLASS)
#define ISSPCARG(c) (ISARG() && spaceseen && !ISSPACE(c))
#define ISLABELPOSSIBLE() ((lexstate == EXPRBEG && !cmdstate) || ISARG())
-#define ISLABELSUFFIX(n) (peekn(':',(n)) && !peek_n(':', (n)+1))

#ifndef RIPPER
#define ambiguousoperator(op, syn) ( \
@@ -6849,7 +6853,7 @@ parseryylex(struct parser_params *parser)
return '>';

    case '"':

• lexstrterm = NEWSTRTERM(str_dquote, '"', 0);

• lexstrterm = NEWSTRTERM(strdquote | MAYBELABEL(), '"', 0);
  return tSTRING_BEG;

  case '`':
  

  @@ -6868,7 +6872,7 @@ parseryylex(struct parserparams *parser)
  return tXSTRING_BEG;

  case '\'':
  

• lexstrterm = NEWSTRTERM(str_squote, '\'', 0);

• lexstrterm = NEWSTRTERM(strsquote | MAYBELABEL(), '\'', 0);
  return tSTRING_BEG;

  case '?':
  

  @@ -8987,6 +8991,32 @@ newargsgen(struct parserparams *parser, NODE *m, NODE *o, ID r, NODE *p, ID b
  rubysourceline = savedline;
  return node;
  }
  +
  +static NODE*
  +dsymnodegen(struct parserparams *parser, NODE *node)
  +{

• if (!node) {

• node = NEWLIT(ID2SYM(rbintern("")));

• }

• else {

• VALUE lit;
  +

• switch (nd_type(node)) {

• case NODE_DSTR:

•  nd_set_type(node, NODE_DSYM);
  

•  break;
  

• case NODE_STR:

•  lit = node->nd_lit;
  

•  node->nd_lit = ID2SYM(rb_intern_str(lit));
  

•  nd_set_type(node, NODE_LIT);
  

•  break;
  

• default:

•  node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node));
  

•  break;
  

• }

• }

• return node;
  +}
  #endif /* !RIPPER */

  static void
  

--- Nobu Nakada
=end

[Hiroshi Nakamura]

• Description updated (diff)
• Category set to core
• Status changed from Open to Assigned
• Assignee set to Yukihiro Matsumoto

[Yusuke Endoh]

• Target version set to next minor

[Jeremy Kemper]

This would improve a lot of my code that's punctuated with { foo: bar, :'hoge' => piyo }. Switching syntax is a mental and visual interruption.

I hope Ruby 2 supports this quoted-symbol syntax from the first day it's released, so everyone can rely on it. Please consider this patch for preview2!

[Eric Hodel]

Sorry, this feature is too late for 2.0.0

[Nobuyoshi Nakada]

One of the reason I didn't introduce this was, a few bundled scripts had compatibility issue when once I tried.