Add basic CSS min/max + varying fixes

JasonTheKitten · JasonTheKitten · commit e413af85df10 · 2024-11-26T15:19:56.000-05:00
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/background/BackgroundPositionValueParser.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/background/BackgroundPositionValueParser.java
@@ -90,7 +90,13 @@ private PropertyValueParseResult<BackgroundPositionValue> parseTwoKeywordPositio
 			PropertyValueParseResult<CSSValue> offsetResult1 = lengthPercentageValueParser.parse(tokens, offset + totalLength, length - totalLength);
 			if (offsetResult1.getResult().isPresent()) totalLength += offsetResult1.getLength();
 
-			if (!(tokens[offset + totalLength] instanceof IdentToken identToken2)) return PropertyValueParseResultImp.empty();
+			if (!(
+				offset + totalLength < length
+				&& tokens[offset + totalLength] instanceof IdentToken identToken2)
+			) {
+				return PropertyValueParseResultImp.empty();
+			}
+			
 			totalLength++;
 			PropertyValueParseResult<CSSValue> offsetResult2 = lengthPercentageValueParser.parse(tokens, offset + totalLength, length - totalLength);
 			if (offsetResult2.getResult().isPresent()) totalLength += offsetResult2.getLength();
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/background/BackgroundValueParser.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/background/BackgroundValueParser.java
@@ -77,7 +77,7 @@ public PropertyValueParseResult<PositionSizeComposite> parse(TokenLike[] tokens,
 			BackgroundPositionValue position = positionResult.getResult().get();
 			int totalLength = positionResult.getLength();
 
-			if (!(tokens[offset + totalLength] instanceof DelimToken delimToken && delimToken.getValue() == '/')) {
+			if (!(totalLength < length && tokens[offset + totalLength] instanceof DelimToken delimToken && delimToken.getValue() == '/')) {
 				return PropertyValueParseResultImp.of(new PositionSizeComposite(position, null), totalLength);
 			}
 			totalLength++;
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/shared/length/LengthValueParser.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/shared/length/LengthValueParser.java
@@ -4,16 +4,23 @@
 import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParseResult;
 import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParser;
 import com.github.webicitybrowser.spec.css.parser.property.imp.PropertyValueParseResultImp;
+import com.github.webicitybrowser.spec.css.parser.property.shared.math.MathValueParser;
 import com.github.webicitybrowser.spec.css.parser.tokens.DimensionToken;
 import com.github.webicitybrowser.spec.css.parser.tokens.NumberToken;
+import com.github.webicitybrowser.spec.css.property.CSSValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.AbsoluteLengthValue;
-import com.github.webicitybrowser.spec.css.property.shared.length.LengthValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.RelativeLengthValue;
 
-public class LengthValueParser implements PropertyValueParser<LengthValue> {
+public class LengthValueParser implements PropertyValueParser<CSSValue> {
+
+	private final MathValueParser mathValueParser = new MathValueParser(LengthValueParser::parseInternal);
 
 	@Override
-	public PropertyValueParseResult<LengthValue> parse(TokenLike[] tokens, int offset, int length) {
+	public PropertyValueParseResult<CSSValue> parse(TokenLike[] tokens, int offset, int length) {
+		return mathValueParser.parse(tokens, offset, length);
+	}
+
+	private static PropertyValueParseResult<CSSValue> parseInternal(TokenLike[] tokens, int offset, int length) {
 		if (length > 0 && offset < tokens.length && tokens[offset] instanceof NumberToken numberToken && numberToken.getValue().floatValue() == 0) {
 			return PropertyValueParseResultImp.of(AbsoluteLengthValue.of(0, "px"), 1);
 		}
@@ -23,14 +30,14 @@ public PropertyValueParseResult<LengthValue> parse(TokenLike[] tokens, int offse
 		}
 
 		DimensionToken token = (DimensionToken) tokens[offset];
-		return creteParseResultFromDimensionToken(token);
+		return createParseResultFromDimensionToken(token);
 	}
 
-	private boolean checkSelectorFormat(TokenLike[] tokens, int offset, int length) {
+	private static boolean checkSelectorFormat(TokenLike[] tokens, int offset, int length) {
 		return length > 0 && offset < tokens.length && tokens[offset] instanceof DimensionToken;
 	}
 
-	private PropertyValueParseResult<LengthValue> creteParseResultFromDimensionToken(DimensionToken token) {
+	private static PropertyValueParseResult<CSSValue> createParseResultFromDimensionToken(DimensionToken token) {
 		switch (token.getUnit()) {
 		case "cm":
 		case "mm":
@@ -62,7 +69,7 @@ private PropertyValueParseResult<LengthValue> creteParseResultFromDimensionToken
 		}		
 	}
 
-	private RelativeLengthValue createRelativeLengthValue(Number value, String unit) {
+	private static RelativeLengthValue createRelativeLengthValue(Number value, String unit) {
 		return new RelativeLengthValue() {
 
 			@Override
@@ -74,6 +81,12 @@ public RelativeLengthUnit getUnit() {
 			public float getValue() {
 				return value.floatValue();
 			}
+
+			@Override
+			public String toString() {
+				return value + unit;
+			}
+
 		};
 	}
 	
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/shared/lengthpercentage/LengthPercentageValueParser.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/shared/lengthpercentage/LengthPercentageValueParser.java
@@ -5,16 +5,23 @@
 import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParser;
 import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParserUtil;
 import com.github.webicitybrowser.spec.css.parser.property.shared.length.LengthValueParser;
+import com.github.webicitybrowser.spec.css.parser.property.shared.math.MathValueParser;
 import com.github.webicitybrowser.spec.css.parser.property.shared.percentage.PercentageValueParser;
 import com.github.webicitybrowser.spec.css.property.CSSValue;
 
 public class LengthPercentageValueParser implements PropertyValueParser<CSSValue> {
 
-	private final LengthValueParser lengthValueParser = new LengthValueParser();
-	private final PercentageValueParser percentageValueParser = new PercentageValueParser();
+	private static final LengthValueParser lengthValueParser = new LengthValueParser();
+	private static final PercentageValueParser percentageValueParser = new PercentageValueParser();
+
+	private final MathValueParser mathValueParser = new MathValueParser(LengthPercentageValueParser::parseInternal);
 
 	@Override
 	public PropertyValueParseResult<CSSValue> parse(TokenLike[] tokens, int offset, int length) {
+		return mathValueParser.parse(tokens, offset, length);
+	}
+	
+	private static PropertyValueParseResult<CSSValue> parseInternal(TokenLike[] tokens, int offset, int length) {
 		return PropertyValueParserUtil.takeLongestResult(
 			lengthValueParser.parse(tokens, offset, length).as(CSSValue.class),
 			percentageValueParser.parse(tokens, offset, length).as(CSSValue.class));
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/shared/math/MathValueParser.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/shared/math/MathValueParser.java
@@ -0,0 +1,77 @@
+package com.github.webicitybrowser.spec.css.parser.property.shared.math;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.github.webicitybrowser.spec.css.componentvalue.FunctionValue;
+import com.github.webicitybrowser.spec.css.parser.TokenLike;
+import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParseResult;
+import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParser;
+import com.github.webicitybrowser.spec.css.parser.property.imp.PropertyValueParseResultImp;
+import com.github.webicitybrowser.spec.css.parser.tokens.CommaToken;
+import com.github.webicitybrowser.spec.css.parser.tokens.WhitespaceToken;
+import com.github.webicitybrowser.spec.css.property.CSSValue;
+import com.github.webicitybrowser.spec.css.property.shared.math.MaxMathValue;
+import com.github.webicitybrowser.spec.css.property.shared.math.MinMathValue;
+
+public class MathValueParser implements PropertyValueParser<CSSValue> {
+
+	private final PropertyValueParser<CSSValue> innerParser;
+
+	public MathValueParser(PropertyValueParser<CSSValue> innerParser) {
+		this.innerParser = innerParser;
+	}
+	
+	@Override
+	public PropertyValueParseResult<CSSValue> parse(TokenLike[] tokens, int offset, int length) {
+		if (length >= 1 && tokens[offset] instanceof FunctionValue functionValue) {
+			TokenLike[] functionTokens = stripWhitespace(functionValue.getValue());
+			PropertyValueParseResult<CSSValue> result = switch (functionValue.getName()) {
+				case "min" -> parseMinMax(functionTokens, 0, functionTokens.length, true);
+				case "max" -> parseMinMax(functionTokens, 0, functionTokens.length, false);
+				default -> PropertyValueParseResultImp.empty();
+			};
+
+			if (
+				result.getResult().isPresent()
+				&& result.getLength() == functionTokens.length
+			) {
+				return PropertyValueParseResultImp.of(result.getResult().get(), 1);
+			}
+		}
+		
+		return innerParser.parse(tokens, offset, length);
+	}
+
+	private PropertyValueParseResult<CSSValue> parseMinMax(TokenLike[] tokens, int offset, int length, boolean isMin) {
+		List<CSSValue> values = new ArrayList<>();
+
+		int priorTokens = 0;
+		do {
+			if (priorTokens != 0) {
+				priorTokens++;
+			}
+			// TODO: Allow calc value
+			PropertyValueParseResult<CSSValue> result = innerParser.parse(tokens, offset + priorTokens, length);
+			if (result.getResult().isEmpty()) {
+				return PropertyValueParseResultImp.empty();
+			}
+			values.add(result.getResult().get());
+
+			priorTokens += result.getLength();
+		} while (offset + priorTokens < length && tokens[offset + priorTokens] instanceof CommaToken);
+
+		CSSValue result = isMin ? new MinMathValue(values) : new MaxMathValue(values);
+		return PropertyValueParseResultImp.of(result, priorTokens);
+	}
+
+	private TokenLike[] stripWhitespace(TokenLike[] tokens) {
+		List<TokenLike> strippedTokens = new ArrayList<>();
+		for (TokenLike token : tokens) {
+			if (token instanceof WhitespaceToken) continue;
+			strippedTokens.add(token);
+		}
+		return strippedTokens.toArray(TokenLike[]::new);
+	}
+	
+}
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/text/LetterSpacingValueParser.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/parser/property/text/LetterSpacingValueParser.java
@@ -6,16 +6,16 @@
 import com.github.webicitybrowser.spec.css.parser.property.imp.PropertyValueParseResultImp;
 import com.github.webicitybrowser.spec.css.parser.property.shared.length.LengthValueParser;
 import com.github.webicitybrowser.spec.css.parser.tokens.IdentToken;
+import com.github.webicitybrowser.spec.css.property.CSSValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.AbsoluteLengthValue;
-import com.github.webicitybrowser.spec.css.property.shared.length.LengthValue;
 
-public class LetterSpacingValueParser implements PropertyValueParser<LengthValue> {
+public class LetterSpacingValueParser implements PropertyValueParser<CSSValue> {
 
 	private final LengthValueParser lengthValueParser = new LengthValueParser();
 
 	@Override
-	public PropertyValueParseResult<LengthValue> parse(TokenLike[] tokens, int offset, int length) {
-		if (length > 0 && tokens[offset] instanceof IdentToken && ((IdentToken) tokens[offset]).equals("normal")) {
+	public PropertyValueParseResult<CSSValue> parse(TokenLike[] tokens, int offset, int length) {
+		if (length > 0 && tokens[offset] instanceof IdentToken && ((IdentToken) tokens[offset]).getValue().equals("normal")) {
 			return PropertyValueParseResultImp.of(AbsoluteLengthValue.of(0, "px"), 1);
 		}
 
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/length/AbsoluteLengthValue.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/length/AbsoluteLengthValue.java
@@ -21,6 +21,11 @@ public AbsoluteLengthUnit getUnit() {
 			public float getValue() {
 				return value.floatValue();
 			}
+
+			@Override
+			public String toString() {
+				return value + unit.name().toLowerCase();
+			}
 		};
 	}
 
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/math/MathValue.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/math/MathValue.java
@@ -0,0 +1,7 @@
+package com.github.webicitybrowser.spec.css.property.shared.math;
+
+import com.github.webicitybrowser.spec.css.property.CSSValue;
+
+public interface MathValue extends CSSValue {
+	
+}
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/math/MaxMathValue.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/math/MaxMathValue.java
@@ -0,0 +1,21 @@
+package com.github.webicitybrowser.spec.css.property.shared.math;
+
+import java.util.List;
+
+import com.github.webicitybrowser.spec.css.property.CSSValue;
+
+public record MaxMathValue(List<CSSValue> values) implements MathValue {
+
+	@Override
+	public String toString() {
+		StringBuilder valueStr = new StringBuilder();
+		for (int i = 0; i < values.size(); i++) {
+			if (i != 0) {
+				valueStr.append(", ");
+			}
+			valueStr.append(values.get(i));
+		}
+		return "max(" + valueStr + ")";
+	}
+	
+}
diff --git a/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/math/MinMathValue.java b/Spec/src/main/java/com/github/webicitybrowser/spec/css/property/shared/math/MinMathValue.java
@@ -0,0 +1,14 @@
+package com.github.webicitybrowser.spec.css.property.shared.math;
+
+import java.util.List;
+
+import com.github.webicitybrowser.spec.css.property.CSSValue;
+
+public record MinMathValue(List<CSSValue> values) implements MathValue {
+
+	@Override
+	public String toString() {
+		return "min(" + values + ")";
+	}
+	
+}
diff --git a/Spec/src/test/java/com/github/webicitybrowser/spec/css/parser/property/shared/length/LengthValueParserTest.java b/Spec/src/test/java/com/github/webicitybrowser/spec/css/parser/property/shared/length/LengthValueParserTest.java
@@ -10,9 +10,9 @@
 
 import com.github.webicitybrowser.spec.css.parser.TokenLike;
 import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParseResult;
+import com.github.webicitybrowser.spec.css.property.CSSValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.AbsoluteLengthValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.AbsoluteLengthValue.AbsoluteLengthUnit;
-import com.github.webicitybrowser.spec.css.property.shared.length.LengthValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.RelativeLengthValue;
 import com.github.webicitybrowser.spec.css.property.shared.length.RelativeLengthValue.RelativeLengthUnit;
 
@@ -29,7 +29,7 @@ public void setup() {
 	@DisplayName("Can parse absolute length")
 	public void canParseAbsoluteLength() {
 		TokenLike[] tokens = new TokenLike[] { createDimensionToken(400, "px") };
-		PropertyValueParseResult<LengthValue> result = lengthValueParser.parse(tokens, 0, tokens.length);
+		PropertyValueParseResult<CSSValue> result = lengthValueParser.parse(tokens, 0, tokens.length);
 		Assertions.assertTrue(result.getResult().isPresent());
 		Assertions.assertInstanceOf(AbsoluteLengthValue.class, result.getResult().get());
 		AbsoluteLengthValue absoluteLengthValue = (AbsoluteLengthValue) result.getResult().get();
@@ -41,7 +41,7 @@ public void canParseAbsoluteLength() {
 	@DisplayName("Can parse relative length")
 	public void canParseRelativeLength() {
 		TokenLike[] tokens = new TokenLike[] { createDimensionToken(400, "em") };
-		PropertyValueParseResult<LengthValue> result = lengthValueParser.parse(tokens, 0, tokens.length);
+		PropertyValueParseResult<CSSValue> result = lengthValueParser.parse(tokens, 0, tokens.length);
 		Assertions.assertTrue(result.getResult().isPresent());
 		Assertions.assertInstanceOf(RelativeLengthValue.class, result.getResult().get());
 		RelativeLengthValue relativeLengthValue = (RelativeLengthValue) result.getResult().get();
@@ -53,7 +53,7 @@ public void canParseRelativeLength() {
 	@DisplayName("Can parse zero")
 	public void canParseZero() {
 		TokenLike[] tokens = new TokenLike[] { createNumberToken(0) };
-		PropertyValueParseResult<LengthValue> result = lengthValueParser.parse(tokens, 0, tokens.length);
+		PropertyValueParseResult<CSSValue> result = lengthValueParser.parse(tokens, 0, tokens.length);
 		Assertions.assertTrue(result.getResult().isPresent());
 		Assertions.assertInstanceOf(AbsoluteLengthValue.class, result.getResult().get());
 		AbsoluteLengthValue absoluteLengthValue = (AbsoluteLengthValue) result.getResult().get();
diff --git a/Spec/src/test/java/com/github/webicitybrowser/spec/css/parser/property/shared/math/MathValueParserTest.java b/Spec/src/test/java/com/github/webicitybrowser/spec/css/parser/property/shared/math/MathValueParserTest.java
@@ -0,0 +1,80 @@
+package com.github.webicitybrowser.spec.css.parser.property.shared.math;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import com.github.webicitybrowser.spec.css.componentvalue.FunctionValue;
+import com.github.webicitybrowser.spec.css.parser.TokenLike;
+import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParseResult;
+import com.github.webicitybrowser.spec.css.parser.property.PropertyValueParser;
+import com.github.webicitybrowser.spec.css.parser.property.imp.PropertyValueParseResultImp;
+import com.github.webicitybrowser.spec.css.parser.tokens.CommaToken;
+import com.github.webicitybrowser.spec.css.property.CSSValue;
+import com.github.webicitybrowser.spec.css.property.shared.math.MinMathValue;
+
+public class MathValueParserTest {
+
+	private MathValueParser mathValueParser;
+
+	@BeforeEach
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void setup() {
+		mathValueParser = new MathValueParser((PropertyValueParser<CSSValue>) (PropertyValueParser) new IntegerValueParser());
+	}
+
+	@Test
+	@DisplayName("Can parse value with no math function")
+	public void canParseValueWithNoMathFunction() {
+		TokenLike[] tokens = new TokenLike[] { new IntegerToken(5) };
+		PropertyValueParseResult<CSSValue> result = mathValueParser.parse(tokens, 0, tokens.length);
+		Assertions.assertTrue(result.getResult().isPresent());
+		Assertions.assertEquals(new IntegerValue(5), result.getResult().get());
+	}
+
+	@Test
+	@DisplayName("Can parse value with min function")
+	public void canParseValueWithMinFunction() {
+		TokenLike[] tokens = new TokenLike[] {
+			createFunctionValue("min",
+				new IntegerToken(5), new CommaToken() {}, new IntegerToken(3)
+			)
+		};
+		PropertyValueParseResult<CSSValue> result = mathValueParser.parse(tokens, 0, tokens.length);
+		Assertions.assertTrue(result.getResult().isPresent());
+		Assertions.assertEquals(
+			new MinMathValue(List.of(new IntegerValue(5), new IntegerValue(3))),
+			result.getResult().get());
+	}
+
+	private static class IntegerValueParser implements PropertyValueParser<IntegerValue> {
+		@Override
+		public PropertyValueParseResult<IntegerValue> parse(TokenLike[] tokens, int offset, int length) {
+			if (length > 0 && tokens[offset] instanceof IntegerToken) {
+				return PropertyValueParseResultImp.of(new IntegerValue(((IntegerToken) tokens[offset]).value()), 1);
+			} else {
+				return PropertyValueParseResultImp.empty();
+			}
+		}
+	}
+
+	private static FunctionValue createFunctionValue(String name, TokenLike... values) {
+		return new FunctionValue() {
+			@Override
+			public String getName() {
+				return name;
+			}
+			@Override
+			public TokenLike[] getValue() {
+				return values;
+			}
+		};
+	}
+
+	private static record IntegerToken(int value) implements TokenLike {}
+	private static record IntegerValue(int value) implements CSSValue {}
+	
+}
diff --git a/ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/value/SizeCalculation.java b/ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/value/SizeCalculation.java
diff --git a/ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/value/math/MathCalculation.java b/ThreadyWeb/src/main/java/com/github/webicitybrowser/threadyweb/graphical/value/math/MathCalculation.java
diff --git a/Webicity/src/main/java/com/github/webicitybrowser/webicity/renderer/frontend/thready/html/style/cssbinding/decparser/componentparser/MathParser.java b/Webicity/src/main/java/com/github/webicitybrowser/webicity/renderer/frontend/thready/html/style/cssbinding/decparser/componentparser/MathParser.java
diff --git a/Webicity/src/main/java/com/github/webicitybrowser/webicity/renderer/frontend/thready/html/style/cssbinding/decparser/componentparser/SizeParser.java b/Webicity/src/main/java/com/github/webicitybrowser/webicity/renderer/frontend/thready/html/style/cssbinding/decparser/componentparser/SizeParser.java
diff --git a/Webicity/src/main/java/com/github/webicitybrowser/webicity/renderer/frontend/thready/html/style/cssbinding/decparser/text/CSSOMLetterSpacingDeclarationParser.java b/Webicity/src/main/java/com/github/webicitybrowser/webicity/renderer/frontend/thready/html/style/cssbinding/decparser/text/CSSOMLetterSpacingDeclarationParser.java

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public PropertyValueParseResult<PositionSizeComposite> parse(TokenLike[] tokens,`
`77`	`77`	`BackgroundPositionValue position = positionResult.getResult().get();`
`78`	`78`	`int totalLength = positionResult.getLength();`
`79`	`79`
`80`		`- if (!(tokens[offset + totalLength] instanceof DelimToken delimToken && delimToken.getValue() == '/')) {`
	`80`	`+ if (!(totalLength < length && tokens[offset + totalLength] instanceof DelimToken delimToken && delimToken.getValue() == '/')) {`
`81`	`81`	`return PropertyValueParseResultImp.of(new PositionSizeComposite(position, null), totalLength);`
`82`	`82`	`}`
`83`	`83`	`totalLength++;`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,11 @@ public AbsoluteLengthUnit getUnit() {`
`21`	`21`	`public float getValue() {`
`22`	`22`	`return value.floatValue();`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ @Override`
	`26`	`+ public String toString() {`
	`27`	`+ return value + unit.name().toLowerCase();`
	`28`	`+ }`
`24`	`29`	`};`
`25`	`30`	`}`
`26`	`31`