Changeset 826


Ignore:
Timestamp:
Aug 3, 2012 3:42:27 PM (12 years ago)
Author:
biz002
Message:

avoid extra line breaks when pp'ing closing of magnolia blocks

Location:
trunk/magnolia-eclipse/src/org/magnolialang
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/lib/Pretty.rsc

    r821 r826  
    6565  <"KEYWORD", "RPAREN"> : Insert(Space(" ")),
    6666  <"*", "LBRACE"> : Sequence([Insert(BeginIndent), Insert(Line())]),
     67  <"RBRACE", "SEMICOLON"> : Sequence([Insert(EndIndent), Insert(Line())]),
    6768  <"RBRACE", "*"> : Sequence([Insert(EndIndent), Insert(Line())]),
     69  <"RBRACE", "RBRACE"> : Sequence([Insert(EndIndent), Insert(Line())]),
     70  <"SEMICOLON", "RBRACE"> : Nothing(),
    6871  <"*", "RBRACE"> : Insert(Line()),
    6972  <"*", "SEMICOLON"> : Insert(Line()),

  • trunk/magnolia-eclipse/src/org/magnolialang/pgf/engines/Spacer.rsc

    r808 r826  
    3131    | Sequence(list[Decision] todo)
    3232        | ModeChoice(map[SpacerMode,Decision] choiceMap, Decision choiceDefault)
    33         | Nothing()
    34         | Skip()
     33    | Nothing() // void action
     34    | Skip() // skips entire command sequence
     35    | Break() // skips rest of command sequence
    3536        ;
    3637       
    … …  
    7778    case Nothing():
    7879      ;
     80    case Insert(t):
     81      outToks = put(t, outToks);
    7982    case Skip():
    8083      return <outToks, ctx>;
    81     case Insert(t):
    82       outToks = put(t, outToks);
     84    case Break():
     85      break;
    8386    case EnterContext(tbl):
    8487      ctx = enterContext(ctx, tbl);

  • trunk/magnolia-eclipse/src/org/magnolialang/pgf/tests/TestPrettyMagnolia.rsc

    r825 r826  
    112112  <"KEYWORD", "RPAREN"> : Insert(Space(" ")),
    113113  <"*", "LBRACE"> : Sequence([Insert(BeginIndent), Insert(Line())]),
     114  <"RBRACE", "SEMICOLON"> : Sequence([Insert(EndIndent), Insert(Line())]),
    114115  <"RBRACE", "*"> : Sequence([Insert(EndIndent), Insert(Line())]),
     116  <"RBRACE", "RBRACE"> : Sequence([Insert(EndIndent), Insert(Line())]),
     117  <"SEMICOLON", "RBRACE"> : Nothing(),
    115118  <"*", "RBRACE"> : Insert(Line()),
    116119  <"*", "SEMICOLON"> : Insert(Line()),
Note: See TracChangeset for help on using the changeset viewer.