clean up of lang::box::*

src/org/rascalmpl/library/lang/box/syntax/Box.rsc

@@ -5,119 +5,35 @@
   which accompanies this distribution, and is available at
   http://www.eclipse.org/legal/epl-v10.html
 }
+@contributor{Jurgen J. Vinju - [email protected] - CWI}
 @contributor{Bert Lisser - [email protected] (CWI)}
-
 module lang::box::\syntax::Box
 
-start syntax Main = Boxx WhitespaceAndComment*;
-
-syntax Boxx
-        = StrCon
-        | BoxOperator box_operator "[" Boxx* list "]"
-        | FontOperator font_operator "[" Boxx* list "]"
-        | "LBL" "[" StrCon "," Boxx "]"
-        | "REF" "[" StrCon "," Boxx "]"
-        | "CNT" "[" StrCon "," StrCon "]"
-     // | "O" SOptions "[" Boxx BoxString Boxx "]" 
- ;
-
-
-lexical StrCon
-	= [\"] StrChar* chars [\"] 
-	;
-
-lexical StrChar
-    = "\\" [\" \' \< \> \\ b f n r t] 
-    | ![\" \' \< \> \\] 
+@synopsis{Every kind of boxes encodes one or more parameterized two-dimensional text constraints.}
+@description{
+* `H` puts their elements next to each other one the same line separated by `hs` spaces.
+* `V` puts their elements below each other on their own line, separated by `vs` empty lines.
+* `HOV` acts like `H` as long as the elements all fit on one line, otherwise it becomes a `V`
+* `HV` acts like H until the line is full, and then continues on the next line like `V`.
+* `I` is a `V` box that indents every line in the output with `is` spaces
+* `WD` produces a number of spaces exactly as wide as the wides line of the constituent boxes
+* `A` is a table formatter. The list of Rows is formatted with `H` but each cell is aligned vertically with the rows above and below.
+* `SPACE` produces `space` spaces
+* `L` produces the literal word. This word may only contain printable characters and no spaces; this is a required property that the formatting algorithm depends on for correctness.
+}
+data Box(int hs=1, int vs=0, int is=2)
+    = H(list[Box] boxes)
+    | V(list[Box] boxes)
+    | HOV(list[Box] boxes)
+    | HV(list[Box] boxes)
+    | I(list[Box] boxes)
+    | WD(list[Box] boxes)
+    | A(list[Row] rows, list[Alignment] columns=[l() | [R(list[Box] cs), *_] := rows, _ <- cs] /* learns the amount of columns from the first row */)
+    | SPACE(int space)
+    | L(str word)
     ;
-
-
-lexical NatCon = [0-9]+ ;
 
-syntax BoxOperator
-        = "A" AlignmentOptions alignments SpaceOption* options
-        | "R"
-        | "H" SpaceOption* options
-        | "V" SpaceOption* options
-        | "HV" SpaceOption* options
-        | "HOV" SpaceOption* options
-        | "I" SpaceOption* options
-        | "WD"
-        /*
-        | "COMM"
-        | "F" FontOption* options
-        | "G" GroupOption* options
-        | "SL" GroupOption* options
-        */
-        ;
-
-syntax FontOperator
-        = "KW"
-        | "VAR"
-        | "NUM"
-        | "MATH"
-        | "ESC"
-        | "COMM"
-        | "STRING"
-        ;
-
-syntax AlignmentOption
-        = "l" SpaceOption* options
-        | "c" SpaceOption* options
-        | "r" SpaceOption* options
-        ;
-
-syntax AlignmentOptions
-        = "(" {AlignmentOption ","}* ")"
-        ;
-
-syntax SpaceSymbol
-        = "hs"
-        | "vs"
-        | "is"
-        | "ts"
-        ;
-
-syntax SpaceOption
-        = SpaceSymbol "=" NatCon
-        ;
+data Row = R(list[Box] cells);
 
-syntax Context
-        = "H"
-        | "V"
- ;
-/*
-syntax FontValue
-        = NatCon
-        | FontId
- ;
-syntax FontOption
-        =
-        FontParam "=" FontValue
- ;
-syntax FontParam
-        = "fn"
-        | "fm"
-        | "se"
-        | "sh"
-        | "sz"
-        | "cl"
- ;
+data Alignment = l() | r() | c();  
 
- */
-syntax GroupOption
-        = "gs" "=" NatCon
-        | "op" "=" BoxOperator
-        ;
-
-layout WhiteSpace =
-            WhitespaceAndComment*
-            !>> [\ \t\n\r]
-            !>> "%"
-            ;
-
-lexical WhitespaceAndComment 
-  = [\ \t\n\r]
-  | "%" [!%]* "%"
-  | "%%" [!\n]* "\n"
-  ;

src/org/rascalmpl/library/lang/box/util/Box2Text.rsc

@@ -68,7 +68,7 @@ module lang::box::util::Box2Text
 import util::Math;
 import List;
 import String;
-import lang::box::util::Box;
+import lang::box::\syntax::Box;
 
 @synopsis{Converts boxes into a string by finding an "optimal" two-dimensional layout}
 @description{