diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-03-07 11:42:44 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-03-07 11:42:44 +0000 |
| commit | 14931421f0e2a3655d2458304a3aec6aeaf08849 (patch) | |
| tree | c94fc370fd1b9602a3d42aaf8f79dfb9fe01c97b | |
| parent | 3d0ccf6f619788665f0cf536b6a1a15ddbb89dfd (diff) | |
| download | FMark-14931421f0e2a3655d2458304a3aec6aeaf08849.tar.gz FMark-14931421f0e2a3655d2458304a3aec6aeaf08849.zip | |
Fixed failing tests and build script
| -rw-r--r-- | FMark/src/Lexer/LexerTest.fs | 8 | ||||
| -rw-r--r-- | FMark/src/TOCite/TOCite.fs | 32 | ||||
| -rwxr-xr-x | build.sh | 15 |
3 files changed, 53 insertions, 2 deletions
diff --git a/FMark/src/Lexer/LexerTest.fs b/FMark/src/Lexer/LexerTest.fs index dbb97d4..35d7f2c 100644 --- a/FMark/src/Lexer/LexerTest.fs +++ b/FMark/src/Lexer/LexerTest.fs @@ -221,6 +221,10 @@ let lexTest = "Escaping characters", @"\_\\\***\%\+", [LITERAL "_"; LITERAL @"\"; LITERAL "***"; LITERAL "%"; LITERAL "+"; ENDLINE] + + "Whitespace", + " d ", + [WHITESPACE 10; LITERAL "d"; WHITESPACE 4; ENDLINE] ] /// Tests for the complete lexers with a string list as input @@ -242,6 +246,10 @@ let lexListTest = [LITERAL "_"; LITERAL @"\"; LITERAL "***"; LITERAL "%"; LITERAL "+"; ENDLINE LITERAL "_"; LITERAL @"\"; LITERAL "***"; LITERAL "%"; LITERAL "+"; ENDLINE LITERAL "_"; LITERAL @"\"; LITERAL "*"; LITERAL "%"; LITERAL "+"; ENDLINE] + + "Whitespace", + [" d "], + [WHITESPACE 10; LITERAL "d"; WHITESPACE 4; ENDLINE] ] // -------------------------------------------------- diff --git a/FMark/src/TOCite/TOCite.fs b/FMark/src/TOCite/TOCite.fs index 9c29727..7daf7cb 100644 --- a/FMark/src/TOCite/TOCite.fs +++ b/FMark/src/TOCite/TOCite.fs @@ -1,5 +1,4 @@ module TOCite -open Shared open Types let rec (|NormalWords|_|) tok = @@ -8,8 +7,37 @@ let rec (|NormalWords|_|) tok = | LITERAL lit -> Some lit | WHITESPACE _ -> Some " " | NUMBER num -> Some num - | CharTok t -> Some t + | HASH -> Some "#" + | PIPE -> Some "|" + | EQUAL -> Some "=" + | MINUS -> Some "-" + | PLUS -> Some "+" + // | ASTERISK -> Some "*" + | DOT -> Some "." + | DASTERISK -> Some "**" + | TASTERISK -> Some "***" + // | UNDERSCORE + | DUNDERSCORE -> Some "__" + | TUNDERSCORE -> Some "___" + | TILDE -> Some "~" + | DTILDE -> Some "~~" + | TTILDE -> Some "~~~" + // | LSBRA -> Some "[" + // | RSBRA -> Some "]" + | LBRA -> Some "(" + | RBRA -> Some ")" + | BSLASH -> Some "\\" + | SLASH -> Some "/" + | LABRA -> Some "<" + | RABRA -> Some ">" + | LCBRA -> Some "{" + | RCBRA -> Some "}" + | BACKTICK -> Some "`" + | EXCLAMATION -> Some "!" // | ENDLINE + | COLON -> Some ":" + | CARET -> Some "^" + | PERCENT -> Some "%" | _ -> None // start of emphasis @@ -26,11 +26,26 @@ fi echo "Running F# tests" cd $BASE_DIR/FMark/src/FMarkCLI dotnet build + +if [[ "$?" != "0" ]]; then + exit 1 +fi + dotnet run --no-build -- -t +if [[ "$?" != "0" ]]; then + exit 1 +fi + if [[ -z $TRAVIS_BUILD_DIR ]]; then echo "Running javascript build" cd $BASE_DIR/FMark/src/FMarkFable dotnet restore + if [[ "$?" != "0" ]]; then + exit 1 + fi dotnet fable yarn-dev + if [[ "$?" != "0" ]]; then + exit 1 + fi fi |