AfflictionNetworks/jmustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch CompoundSegment to BlockSegment. Avoids overloading use of the term

Browse Source 
compound, which I use for compound variables.
This commit is contained in:
Michael Bayne
2011-10-29 14:41:27 -07:00
parent adf116992c
commit a5e7c2ebb8
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/samskivert/mustache/Mustache.java
+13 -13
View File
@@ -345,7 +345,7 @@ public class Mustache
} }
// process the tag between the mustaches // process the tag between the mustaches
accum = accum.addTagSegment(text, line); accum = accum.addTagSegment(text, line);
skipNewline = (tagStartColumn == 1) && accum.justOpenedOrClosedCompound(); skipNewline = (tagStartColumn == 1) && accum.justOpenedOrClosedBlock();
} }
state = TEXT; state = TEXT;
@@ -409,9 +409,9 @@ public class Mustache
_compiler = compiler; _compiler = compiler;
} }
public boolean justOpenedOrClosedCompound () { public boolean justOpenedOrClosedBlock () {
// return true if we just closed a compound segment; we'll handle just opened elsewhere // return true if we just closed a block segment; we'll handle just opened elsewhere
return (!_segs.isEmpty() && _segs.get(_segs.size()-1) instanceof CompoundSegment); return (!_segs.isEmpty() && _segs.get(_segs.size()-1) instanceof BlockSegment);
} }
public void addTextSegment (StringBuilder text) { public void addTextSegment (StringBuilder text) {
@@ -431,9 +431,9 @@ public class Mustache
case '#': case '#':
requireNoNewlines(tag, tagLine); requireNoNewlines(tag, tagLine);
return new Accumulator(_compiler) { return new Accumulator(_compiler) {
@Override public boolean justOpenedOrClosedCompound () { @Override public boolean justOpenedOrClosedBlock () {
// if we just opened this section, we'll have no segments // if we just opened this section, we'll have no segments
return (_segs.isEmpty()) || super.justOpenedOrClosedCompound(); return (_segs.isEmpty()) || super.justOpenedOrClosedBlock();
} }
@Override public Template.Segment[] finish () { @Override public Template.Segment[] finish () {
throw new MustacheParseException( throw new MustacheParseException(
@@ -453,9 +453,9 @@ public class Mustache
case '^': case '^':
requireNoNewlines(tag, tagLine); requireNoNewlines(tag, tagLine);
return new Accumulator(_compiler) { return new Accumulator(_compiler) {
@Override public boolean justOpenedOrClosedCompound () { @Override public boolean justOpenedOrClosedBlock () {
// if we just opened this section, we'll have no segments // if we just opened this section, we'll have no segments
return (_segs.isEmpty()) || super.justOpenedOrClosedCompound(); return (_segs.isEmpty()) || super.justOpenedOrClosedBlock();
} }
@Override public Template.Segment[] finish () { @Override public Template.Segment[] finish () {
throw new MustacheParseException( throw new MustacheParseException(
@@ -577,9 +577,9 @@ public class Mustache
protected boolean _escapeHTML; protected boolean _escapeHTML;
} }
/** A helper class for compound segments. */ /** A helper class for block segments. */
protected static abstract class CompoundSegment extends NamedSegment { protected static abstract class BlockSegment extends NamedSegment {
protected CompoundSegment (String name, Template.Segment[] segs, int line) { protected BlockSegment (String name, Template.Segment[] segs, int line) {
super(name, line); super(name, line);
_segs = segs; _segs = segs;
} }
@@ -592,7 +592,7 @@ public class Mustache
} }
/** A segment that represents a section. */ /** A segment that represents a section. */
protected static class SectionSegment extends CompoundSegment { protected static class SectionSegment extends BlockSegment {
public SectionSegment (String name, Template.Segment[] segs, int line) { public SectionSegment (String name, Template.Segment[] segs, int line) {
super(name, segs, line); super(name, segs, line);
} }
@@ -617,7 +617,7 @@ public class Mustache
} }
/** A segment that represents an inverted section. */ /** A segment that represents an inverted section. */
protected static class InvertedSectionSegment extends CompoundSegment { protected static class InvertedSectionSegment extends BlockSegment {
public InvertedSectionSegment (String name, Template.Segment[] segs, int line) { public InvertedSectionSegment (String name, Template.Segment[] segs, int line) {
super(name, segs, line); super(name, segs, line);
} }