andreacavalli/WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Specify that TabExpandedString only works on single lines

Browse Source
This commit is contained in:
Riccardo Azzolini 2019-08-12 18:55:30 +02:00
parent 804fee4db0
commit c37f7f52b3
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/it/cavallium/warppi/math/rules/dsl/errorutils/TabExpandedString.java
View File

@ -3,7 +3,7 @@ package it.cavallium.warppi.math.rules.dsl.errorutils;
import java.util.Arrays; import java.util.Arrays;
/** /**
* Represents a string in which tabs have been expanded (replaced with spaces). * Represents a line of text in which tabs have been expanded (replaced with spaces).
* <p> * <p>
* Each tab character is replaced with the number of spaces required to get to the next tab stop * Each tab character is replaced with the number of spaces required to get to the next tab stop
* (that is, the next column which is a multiple of the tab stop width). * (that is, the next column which is a multiple of the tab stop width).
@ -15,8 +15,9 @@ public class TabExpandedString {
/** /**
* Constructs a tab-expanded string with the given tab stop width. * Constructs a tab-expanded string with the given tab stop width.
* *
* @param string The string to expand. * @param string The string to expand. Must not contain any line separator characters ('\r' or '\n').
* @param tabWidth The tab stop width. * @param tabWidth The tab stop width.
* @throws IllegalArgumentException If <code>string</code> contains any line separator characters.
*/ */
public TabExpandedString(final String string, final int tabWidth) { public TabExpandedString(final String string, final int tabWidth) {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
@ -26,14 +27,20 @@ public class TabExpandedString {
final char c = string.charAt(i); final char c = string.charAt(i);
charWidths[i] = 1; charWidths[i] = 1;
if (c == '\t') { switch (c) {
builder.append(' '); case '\r':
while (builder.length() % tabWidth != 0) { case '\n':
throw new IllegalArgumentException("The string to expand is not a single line: " + string);
case '\t':
builder.append(' '); builder.append(' ');
charWidths[i]++; while (builder.length() % tabWidth != 0) {
} builder.append(' ');
} else { charWidths[i]++;
builder.append(c); }
break;
default:
builder.append(c);
break;
} }
} }