release

` tags? Can a list be partially "loose" and partially - "tight"? What should we do with a list like this? - - ``` markdown - 1. one - - 2. two - 3. three - ``` - - Or this? - - ``` markdown - 1. one - - a - - - b - 2. two - ``` - - (There are some relevant comments by John Gruber - [here](http://article.gmane.org/gmane.text.markdown.general/2554).) - -5. Can list markers be indented? Can ordered list markers be right-aligned? - - ``` markdown - 8. item 1 - 9. item 2 - 10. item 2a - ``` - -6. Is this one list with a thematic break in its second item, - or two lists separated by a thematic break? - - ``` markdown - * a - * * * * * - * b - ``` - -7. When list markers change from numbers to bullets, do we have - two lists or one? (The Markdown syntax description suggests two, - but the perl scripts and many other implementations produce one.) - - ``` markdown - 1. fee - 2. fie - - foe - - fum - ``` - -8. What are the precedence rules for the markers of inline structure? - For example, is the following a valid link, or does the code span - take precedence ? - - ``` markdown - [a backtick (`)](/url) and [another backtick (`)](/url). - ``` - -9. What are the precedence rules for markers of emphasis and strong - emphasis? For example, how should the following be parsed? - - ``` markdown - *foo *bar* baz* - ``` - -10. What are the precedence rules between block-level and inline-level - structure? For example, how should the following be parsed? - - ``` markdown - - `a long code span can contain a hyphen like this - - and it can screw things up` - ``` - -11. Can list items include section headings? (`Markdown.pl` does not - allow this, but does allow blockquotes to include headings.) - - ``` markdown - - # Heading - ``` - -12. Can list items be empty? - - ``` markdown - * a - * - * b - ``` - -13. Can link references be defined inside block quotes or list items? - - ``` markdown - > Blockquote [foo]. - > - > [foo]: /url - ``` - -14. If there are multiple definitions for the same reference, which takes - precedence? - - ``` markdown - [foo]: /url1 - [foo]: /url2 - - [foo][] - ``` - -In the absence of a spec, early implementers consulted `Markdown.pl` -to resolve these ambiguities. But `Markdown.pl` was quite buggy, and -gave manifestly bad results in many cases, so it was not a -satisfactory replacement for a spec. - -Because there is no unambiguous spec, implementations have diverged -considerably. As a result, users are often surprised to find that -a document that renders one way on one system (say, a github wiki) -renders differently on another (say, converting to docbook using -pandoc). To make matters worse, because nothing in Markdown counts -as a "syntax error," the divergence often isn't discovered right away. - -## About this document - -This document attempts to specify Markdown syntax unambiguously. -It contains many examples with side-by-side Markdown and -HTML. These are intended to double as conformance tests. An -accompanying script `spec_tests.py` can be used to run the tests -against any Markdown program: - - python test/spec_tests.py --spec spec.txt --program PROGRAM - -Since this document describes how Markdown is to be parsed into -an abstract syntax tree, it would have made sense to use an abstract -representation of the syntax tree instead of HTML. But HTML is capable -of representing the structural distinctions we need to make, and the -choice of HTML for the tests makes it possible to run the tests against -an implementation without writing an abstract syntax tree renderer. - -This document is generated from a text file, `spec.txt`, written -in Markdown with a small extension for the side-by-side tests. -The script `tools/makespec.py` can be used to convert `spec.txt` into -HTML or CommonMark (which can then be converted into other formats). - -In the examples, the `â` character is used to represent tabs. - -# Preliminaries - -## Characters and lines - -Any sequence of [characters] is a valid CommonMark -document. - -A [character](@) is a Unicode code point. Although some -code points (for example, combining accents) do not correspond to -characters in an intuitive sense, all code points count as characters -for purposes of this spec. - -This spec does not specify an encoding; it thinks of lines as composed -of [characters] rather than bytes. A conforming parser may be limited -to a certain encoding. - -A [line](@) is a sequence of zero or more [characters] -other than newline (`U+000A`) or carriage return (`U+000D`), -followed by a [line ending] or by the end of file. - -A [line ending](@) is a newline (`U+000A`), a carriage return -(`U+000D`) not followed by a newline, or a carriage return and a -following newline. - -A line containing no characters, or a line containing only spaces -(`U+0020`) or tabs (`U+0009`), is called a [blank line](@). - -The following definitions of character classes will be used in this spec: - -A [whitespace character](@) is a space -(`U+0020`), tab (`U+0009`), newline (`U+000A`), line tabulation (`U+000B`), -form feed (`U+000C`), or carriage return (`U+000D`). - -[Whitespace](@) is a sequence of one or more [whitespace -characters]. - -A [Unicode whitespace character](@) is -any code point in the Unicode `Zs` class, or a tab (`U+0009`), -carriage return (`U+000D`), newline (`U+000A`), or form feed -(`U+000C`). - -[Unicode whitespace](@) is a sequence of one -or more [Unicode whitespace characters]. - -A [space](@) is `U+0020`. - -A [non-whitespace character](@) is any character -that is not a [whitespace character]. - -An [ASCII punctuation character](@) -is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`, -`*`, `+`, `,`, `-`, `.`, `/`, `:`, `;`, `<`, `=`, `>`, `?`, `@`, -`[`, `\`, `]`, `^`, `_`, `` ` ``, `{`, `|`, `}`, or `~`. - -A [punctuation character](@) is an [ASCII -punctuation character] or anything in -the Unicode classes `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`. - -## Tabs - -Tabs in lines are not expanded to [spaces]. However, -in contexts where indentation is significant for the -document's structure, tabs behave as if they were replaced -by spaces with a tab stop of 4 characters. - -```````````````````````````````` example -âfooâbazââbim -. -

-*foo* - -*bar* -. -

-*foo* -

bar

-```````````````````````````````` - - - -A partial tag need not even be completed (garbage -in, garbage out): - -```````````````````````````````` example -

*foo*

-. -

*foo*

-```````````````````````````````` - - -```````````````````````````````` example -

-foo -

-. -

-foo -

-```````````````````````````````` - - -Everything until the next blank line or end of document -gets included in the HTML block. So, in the following -example, what looks like a Markdown code block -is actually part of the HTML block, which continues until a blank -line or the end of the document is reached: - -```````````````````````````````` example -

-``` c -int x = 33; -``` -. -

-``` c -int x = 33; -``` -```````````````````````````````` - - -To start an [HTML block] with a tag that is *not* in the -list of block-level tags in (6), you must put the tag by -itself on the first line (and it must be complete): - -```````````````````````````````` example - -*bar* - -. - -*bar* - -```````````````````````````````` - - -In type 7 blocks, the [tag name] can be anything: - -```````````````````````````````` example - -*bar* - -. - -*bar* - -```````````````````````````````` - - -```````````````````````````````` example - -*bar* - -. - -*bar* - -```````````````````````````````` - - -```````````````````````````````` example - -*bar* -. - -*bar* -```````````````````````````````` - - -These rules are designed to allow us to work with tags that -can function as either block-level or inline-level tags. -The `` tag is a nice example. We can surround content with -`` tags in three different ways. In this case, we get a raw -HTML block, because the `` tag is on a line by itself: - -```````````````````````````````` example - ~~-*foo* -~~ -. - ~~-*foo* -~~ -```````````````````````````````` - - -In this case, we get a raw HTML block that just includes -the `` tag (because it ends with the following blank -line). So the contents get interpreted as CommonMark: - -```````````````````````````````` example - ~~- -*foo* - -~~ -. - -
foo
- -```````````````````````````````` - - -Finally, in this case, the `` tags are interpreted -as [raw HTML] *inside* the CommonMark paragraph. (Because -the tag is not on a line by itself, we get inline HTML -rather than an [HTML block].) - -```````````````````````````````` example -~~*foo*~~ -. -
~~foo~~
-```````````````````````````````` - - -HTML tags designed to contain literal content -(`script`, `style`, `pre`), comments, processing instructions, -and declarations are treated somewhat differently. -Instead of ending at the first blank line, these blocks -end at the first line containing a corresponding end tag. -As a result, these blocks can contain blank lines: - -A pre tag (type 1): - -```````````````````````````````` example -
-import Text.HTML.TagSoup - -main :: IO () -main = print $ parseTags tags -
-. -
-import Text.HTML.TagSoup - -main :: IO () -main = print $ parseTags tags -
-```````````````````````````````` - - -A script tag (type 1): - -```````````````````````````````` example - -. - -```````````````````````````````` - - -A style tag (type 1): - -```````````````````````````````` example - -. - -```````````````````````````````` - - -If there is no matching end tag, the block will end at the -end of the document (or the enclosing [block quote][block quotes] -or [list item][list items]): - -```````````````````````````````` example - -*foo* -. - -
foo
-```````````````````````````````` - - -```````````````````````````````` example -*bar* -*baz* -. -*bar* -
baz
-```````````````````````````````` - - -Note that anything on the last line after the -end tag will be included in the [HTML block]: - -```````````````````````````````` example -1. *bar* -. -1. *bar* -```````````````````````````````` - - -A comment (type 2): - -```````````````````````````````` example - -. - -```````````````````````````````` - - - -A processing instruction (type 3): - -```````````````````````````````` example -'; - -?> -. -'; - -?> -```````````````````````````````` - - -A declaration (type 4): - -```````````````````````````````` example - -. - -```````````````````````````````` - - -CDATA (type 5): - -```````````````````````````````` example - -. - -```````````````````````````````` - - -The opening tag can be indented 1-3 spaces, but not 4: - -```````````````````````````````` example - - - -. - -
 -
-```````````````````````````````` - - -```````````````````````````````` example -
- -
-. -
-
<div> -
-```````````````````````````````` - - -An HTML block of types 1--6 can interrupt a paragraph, and need not be -preceded by a blank line. - -```````````````````````````````` example -Foo -
-bar -
-. -
Foo
-
-bar -
-```````````````````````````````` - - -However, a following blank line is needed, except at the end of -a document, and except for blocks of types 1--5, above: - -```````````````````````````````` example -
-bar -
-*foo* -. -
-bar -
-*foo* -```````````````````````````````` - - -HTML blocks of type 7 cannot interrupt a paragraph: - -```````````````````````````````` example -Foo - -baz -. -
Foo - -baz
-```````````````````````````````` - - -This rule differs from John Gruber's original Markdown syntax -specification, which says: - -> The only restrictions are that block-level HTML elements â -> e.g. `
`, ``, `
`, `
`, etc. â must be separated from -> surrounding content by blank lines, and the start and end tags of the -> block should not be indented with tabs or spaces. - -In some ways Gruber's rule is more restrictive than the one given -here: - -- It requires that an HTML block be preceded by a blank line. -- It does not allow the start tag to be indented. -- It requires a matching end tag, which it also does not allow to - be indented. - -Most Markdown implementations (including some of Gruber's own) do not -respect all of these restrictions. - -There is one respect, however, in which Gruber's rule is more liberal -than the one given here, since it allows blank lines to occur inside -an HTML block. There are two reasons for disallowing them here. -First, it removes the need to parse balanced tags, which is -expensive and can require backtracking from the end of the document -if no matching end tag is found. Second, it provides a very simple -and flexible way of including Markdown content inside HTML tags: -simply separate the Markdown from the HTML using blank lines: - -Compare: - -```````````````````````````````` example -
- -*Emphasized* text. - -
-. -
-
Emphasized text.
-
-```````````````````````````````` - - -```````````````````````````````` example -
-*Emphasized* text. -
-. -
-*Emphasized* text. -
-```````````````````````````````` - - -Some Markdown implementations have adopted a convention of -interpreting content inside tags as text if the open tag has -the attribute `markdown=1`. The rule given above seems a simpler and -more elegant way of achieving the same expressive power, which is also -much simpler to parse. - -The main potential drawback is that one can no longer paste HTML -blocks into Markdown documents with 100% reliability. However, -*in most cases* this will work fine, because the blank lines in -HTML are usually followed by HTML block tags. For example: - -```````````````````````````````` example -
- - - - - - - -
-Hi -
-. - - - - -
-Hi -
-```````````````````````````````` - - -There are problems, however, if the inner tags are indented -*and* separated by spaces, as then they will be interpreted as -an indented code block: - -```````````````````````````````` example - - - - - - - - -
- Hi -
-. - - -
<td> - Hi -</td> -
- -
-```````````````````````````````` - - -Fortunately, blank lines are usually not necessary and can be -deleted. The exception is inside `
` tags, but as described -above, raw HTML blocks starting with `
` *can* contain blank -lines. - -## Link reference definitions - -A [link reference definition](@) -consists of a [link label], indented up to three spaces, followed -by a colon (`:`), optional [whitespace] (including up to one -[line ending]), a [link destination], -optional [whitespace] (including up to one -[line ending]), and an optional [link -title], which if it is present must be separated -from the [link destination] by [whitespace]. -No further [non-whitespace characters] may occur on the line. - -A [link reference definition] -does not correspond to a structural element of a document. Instead, it -defines a label which can be used in [reference links] -and reference-style [images] elsewhere in the document. [Link -reference definitions] can come either before or after the links that use -them. - -```````````````````````````````` example -[foo]: /url "title" - -[foo] -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example - [foo]: - /url - 'the title' - -[foo] -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -[Foo*bar\]]:my_(url) 'title (with parens)' - -[Foo*bar\]] -. -
Foo*bar]
-```````````````````````````````` - - -```````````````````````````````` example -[Foo bar]: - -'title' - -[Foo bar] -. -
Foo bar
-```````````````````````````````` - - -The title may extend over multiple lines: - -```````````````````````````````` example -[foo]: /url ' -title -line1 -line2 -' - -[foo] -. -
foo
-```````````````````````````````` - - -However, it may not contain a [blank line]: - -```````````````````````````````` example -[foo]: /url 'title - -with blank line' - -[foo] -. -
[foo]: /url 'title
-
with blank line'
-
[foo]
-```````````````````````````````` - - -The title may be omitted: - -```````````````````````````````` example -[foo]: -/url - -[foo] -. -
foo
-```````````````````````````````` - - -The link destination may not be omitted: - -```````````````````````````````` example -[foo]: - -[foo] -. -
[foo]:
-
[foo]
-```````````````````````````````` - - -Both title and destination can contain backslash escapes -and literal backslashes: - -```````````````````````````````` example -[foo]: /url\bar\*baz "foo\"bar\baz" - -[foo] -. -
foo
-```````````````````````````````` - - -A link can come before its corresponding definition: - -```````````````````````````````` example -[foo] - -[foo]: url -. -
foo
-```````````````````````````````` - - -If there are several matching definitions, the first one takes -precedence: - -```````````````````````````````` example -[foo] - -[foo]: first -[foo]: second -. -
foo
-```````````````````````````````` - - -As noted in the section on [Links], matching of labels is -case-insensitive (see [matches]). - -```````````````````````````````` example -[FOO]: /url - -[Foo] -. -
Foo
-```````````````````````````````` - - -```````````````````````````````` example -[ÎÎÎ©]: /ÏÎ¿Ï - -[Î±Î³Ï] -. -
Î±Î³Ï
-```````````````````````````````` - - -Here is a link reference definition with no corresponding link. -It contributes nothing to the document. - -```````````````````````````````` example -[foo]: /url -. -```````````````````````````````` - - -Here is another one: - -```````````````````````````````` example -[ -foo -]: /url -bar -. -
bar
-```````````````````````````````` - - -This is not a link reference definition, because there are -[non-whitespace characters] after the title: - -```````````````````````````````` example -[foo]: /url "title" ok -. -
[foo]: /url "title" ok
-```````````````````````````````` - - -This is a link reference definition, but it has no title: - -```````````````````````````````` example -[foo]: /url -"title" ok -. -
"title" ok
-```````````````````````````````` - - -This is not a link reference definition, because it is indented -four spaces: - -```````````````````````````````` example - [foo]: /url "title" - -[foo] -. -
[foo]: /url "title" -
-
[foo]
-```````````````````````````````` - - -This is not a link reference definition, because it occurs inside -a code block: - -```````````````````````````````` example -``` -[foo]: /url -``` - -[foo] -. -
[foo]: /url -
-
[foo]
-```````````````````````````````` - - -A [link reference definition] cannot interrupt a paragraph. - -```````````````````````````````` example -Foo -[bar]: /baz - -[bar] -. -
Foo -[bar]: /baz
-
[bar]
-```````````````````````````````` - - -However, it can directly follow other block elements, such as headings -and thematic breaks, and it need not be followed by a blank line. - -```````````````````````````````` example -# [Foo] -[foo]: /url -> bar -. -
Foo
-
-
bar
-
-```````````````````````````````` - - -Several [link reference definitions] -can occur one after another, without intervening blank lines. - -```````````````````````````````` example -[foo]: /foo-url "foo" -[bar]: /bar-url - "bar" -[baz]: /baz-url - -[foo], -[bar], -[baz] -. -
foo, -bar, -baz
-```````````````````````````````` - - -[Link reference definitions] can occur -inside block containers, like lists and block quotations. They -affect the entire document, not just the container in which they -are defined: - -```````````````````````````````` example -[foo] - -> [foo]: /url -. -
foo
-
-
-```````````````````````````````` - - - -## Paragraphs - -A sequence of non-blank lines that cannot be interpreted as other -kinds of blocks forms a [paragraph](@). -The contents of the paragraph are the result of parsing the -paragraph's raw content as inlines. The paragraph's raw content -is formed by concatenating the lines and removing initial and final -[whitespace]. - -A simple example with two paragraphs: - -```````````````````````````````` example -aaa - -bbb -. -
aaa
-
bbb
-```````````````````````````````` - - -Paragraphs can contain multiple lines, but no blank lines: - -```````````````````````````````` example -aaa -bbb - -ccc -ddd -. -
aaa -bbb
-
ccc -ddd
-```````````````````````````````` - - -Multiple blank lines between paragraph have no effect: - -```````````````````````````````` example -aaa - - -bbb -. -
aaa
-
bbb
-```````````````````````````````` - - -Leading spaces are skipped: - -```````````````````````````````` example - aaa - bbb -. -
aaa -bbb
-```````````````````````````````` - - -Lines after the first may be indented any amount, since indented -code blocks cannot interrupt paragraphs. - -```````````````````````````````` example -aaa - bbb - ccc -. -
aaa -bbb -ccc
-```````````````````````````````` - - -However, the first line may be indented at most three spaces, -or an indented code block will be triggered: - -```````````````````````````````` example - aaa -bbb -. -
aaa -bbb
-```````````````````````````````` - - -```````````````````````````````` example - aaa -bbb -. -
aaa -
-
bbb
-```````````````````````````````` - - -Final spaces are stripped before inline parsing, so a paragraph -that ends with two or more spaces will not end with a [hard line -break]: - -```````````````````````````````` example -aaa -bbb -. -
aaa
-bbb
-```````````````````````````````` - - -## Blank lines - -[Blank lines] between block-level elements are ignored, -except for the role they play in determining whether a [list] -is [tight] or [loose]. - -Blank lines at the beginning and end of the document are also ignored. - -```````````````````````````````` example - - -aaa - - -# aaa - - -. -
aaa
-
aaa
-```````````````````````````````` - - - -# Container blocks - -A [container block] is a block that has other -blocks as its contents. There are two basic kinds of container blocks: -[block quotes] and [list items]. -[Lists] are meta-containers for [list items]. - -We define the syntax for container blocks recursively. The general -form of the definition is: - -> If X is a sequence of blocks, then the result of -> transforming X in such-and-such a way is a container of type Y -> with these blocks as its content. - -So, we explain what counts as a block quote or list item by explaining -how these can be *generated* from their contents. This should suffice -to define the syntax, although it does not give a recipe for *parsing* -these constructions. (A recipe is provided below in the section entitled -[A parsing strategy](#appendix-a-parsing-strategy).) - -## Block quotes - -A [block quote marker](@) -consists of 0-3 spaces of initial indent, plus (a) the character `>` together -with a following space, or (b) a single character `>` not followed by a space. - -The following rules define [block quotes]: - -1. **Basic case.** If a string of lines *Ls* constitute a sequence - of blocks *Bs*, then the result of prepending a [block quote - marker] to the beginning of each line in *Ls* - is a [block quote](#block-quotes) containing *Bs*. - -2. **Laziness.** If a string of lines *Ls* constitute a [block - quote](#block-quotes) with contents *Bs*, then the result of deleting - the initial [block quote marker] from one or - more lines in which the next [non-whitespace character] after the [block - quote marker] is [paragraph continuation - text] is a block quote with *Bs* as its content. - [Paragraph continuation text](@) is text - that will be parsed as part of the content of a paragraph, but does - not occur at the beginning of the paragraph. - -3. **Consecutiveness.** A document cannot contain two [block - quotes] in a row unless there is a [blank line] between them. - -Nothing else counts as a [block quote](#block-quotes). - -Here is a simple example: - -```````````````````````````````` example -> # Foo -> bar -> baz -. -
-
Foo
-
bar -baz
-
-```````````````````````````````` - - -The spaces after the `>` characters can be omitted: - -```````````````````````````````` example -># Foo ->bar -> baz -. -
-
Foo
-
bar -baz
-
-```````````````````````````````` - - -The `>` characters can be indented 1-3 spaces: - -```````````````````````````````` example - > # Foo - > bar - > baz -. -
-
Foo
-
bar -baz
-
-```````````````````````````````` - - -Four spaces gives us a code block: - -```````````````````````````````` example - > # Foo - > bar - > baz -. -
> # Foo -> bar -> baz -
-```````````````````````````````` - - -The Laziness clause allows us to omit the `>` before a -paragraph continuation line: - -```````````````````````````````` example -> # Foo -> bar -baz -. -
-
Foo
-
bar -baz
-
-```````````````````````````````` - - -A block quote can contain some lazy and some non-lazy -continuation lines: - -```````````````````````````````` example -> bar -baz -> foo -. -
-
bar -baz -foo
-
-```````````````````````````````` - - -Laziness only applies to lines that would have been continuations of -paragraphs had they been prepended with [block quote markers]. -For example, the `> ` cannot be omitted in the second line of - -``` markdown -> foo -> --- -``` - -without changing the meaning: - -```````````````````````````````` example -> foo ---- -. -
-
foo
-
-
-```````````````````````````````` - - -Similarly, if we omit the `> ` in the second line of - -``` markdown -> - foo -> - bar -``` - -then the block quote ends after the first line: - -```````````````````````````````` example -> - foo -- bar -. -
-
-
foo
-
-
-
-
bar
-
-```````````````````````````````` - - -For the same reason, we can't omit the `> ` in front of -subsequent lines of an indented or fenced code block: - -```````````````````````````````` example -> foo - bar -. -
-
foo -
-
-
bar -
-```````````````````````````````` - - -```````````````````````````````` example -> ``` -foo -``` -. -
-
-
-
foo
-
-```````````````````````````````` - - -Note that in the following case, we have a paragraph -continuation line: - -```````````````````````````````` example -> foo - - bar -. -
-
foo -- bar
-
-```````````````````````````````` - - -To see why, note that in - -```markdown -> foo -> - bar -``` - -the `- bar` is indented too far to start a list, and can't -be an indented code block because indented code blocks cannot -interrupt paragraphs, so it is a [paragraph continuation line]. - -A block quote can be empty: - -```````````````````````````````` example -> -. -
-
-```````````````````````````````` - - -```````````````````````````````` example -> -> -> -. -
-
-```````````````````````````````` - - -A block quote can have initial or final blank lines: - -```````````````````````````````` example -> -> foo -> -. -
-
foo
-
-```````````````````````````````` - - -A blank line always separates block quotes: - -```````````````````````````````` example -> foo - -> bar -. -
-
foo
-
-
-
bar
-
-```````````````````````````````` - - -(Most current Markdown implementations, including John Gruber's -original `Markdown.pl`, will parse this example as a single block quote -with two paragraphs. But it seems better to allow the author to decide -whether two block quotes or one are wanted.) - -Consecutiveness means that if we put these block quotes together, -we get a single block quote: - -```````````````````````````````` example -> foo -> bar -. -
-
foo -bar
-
-```````````````````````````````` - - -To get a block quote with two paragraphs, use: - -```````````````````````````````` example -> foo -> -> bar -. -
-
foo
-
bar
-
-```````````````````````````````` - - -Block quotes can interrupt paragraphs: - -```````````````````````````````` example -foo -> bar -. -
foo
-
-
bar
-
-```````````````````````````````` - - -In general, blank lines are not needed before or after block -quotes: - -```````````````````````````````` example -> aaa -*** -> bbb -. -
-
aaa
-
-
-
-
bbb
-
-```````````````````````````````` - - -However, because of laziness, a blank line is needed between -a block quote and a following paragraph: - -```````````````````````````````` example -> bar -baz -. -
-
bar -baz
-
-```````````````````````````````` - - -```````````````````````````````` example -> bar - -baz -. -
-
bar
-
-
baz
-```````````````````````````````` - - -```````````````````````````````` example -> bar -> -baz -. -
-
bar
-
-
baz
-```````````````````````````````` - - -It is a consequence of the Laziness rule that any number -of initial `>`s may be omitted on a continuation line of a -nested block quote: - -```````````````````````````````` example -> > > foo -bar -. -
-
-
-
foo -bar
-
-
-
-```````````````````````````````` - - -```````````````````````````````` example ->>> foo -> bar ->>baz -. -
-
-
-
foo -bar -baz
-
-
-
-```````````````````````````````` - - -When including an indented code block in a block quote, -remember that the [block quote marker] includes -both the `>` and a following space. So *five spaces* are needed after -the `>`: - -```````````````````````````````` example -> code - -> not code -. -
-
code -
-
-
-
not code
-
-```````````````````````````````` - - - -## List items - -A [list marker](@) is a -[bullet list marker] or an [ordered list marker]. - -A [bullet list marker](@) -is a `-`, `+`, or `*` character. - -An [ordered list marker](@) -is a sequence of 1--9 arabic digits (`0-9`), followed by either a -`.` character or a `)` character. (The reason for the length -limit is that with 10 digits we start seeing integer overflows -in some browsers.) - -The following rules define [list items]: - -1. **Basic case.** If a sequence of lines *Ls* constitute a sequence of - blocks *Bs* starting with a [non-whitespace character] and not separated - from each other by more than one blank line, and *M* is a list - marker of width *W* followed by 0 < *N* < 5 spaces, then the result - of prepending *M* and the following spaces to the first line of - *Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a - list item with *Bs* as its contents. The type of the list item - (bullet or ordered) is determined by the type of its list marker. - If the list item is ordered, then it is also assigned a start - number, based on the ordered list marker. - -For example, let *Ls* be the lines - -```````````````````````````````` example -A paragraph -with two lines. - - indented code - -> A block quote. -. -
A paragraph -with two lines.
-
indented code -
-
-
A block quote.
-
-```````````````````````````````` - - -And let *M* be the marker `1.`, and *N* = 2. Then rule #1 says -that the following is an ordered list item with start number 1, -and the same contents as *Ls*: - -```````````````````````````````` example -1. A paragraph - with two lines. - - indented code - - > A block quote. -. -
-
-
A paragraph -with two lines.
-
indented code -
-
-
A block quote.
-
-
-
-```````````````````````````````` - - -The most important thing to notice is that the position of -the text after the list marker determines how much indentation -is needed in subsequent blocks in the list item. If the list -marker takes up two spaces, and there are three spaces between -the list marker and the next [non-whitespace character], then blocks -must be indented five spaces in order to fall under the list -item. - -Here are some examples showing how far content must be indented to be -put under the list item: - -```````````````````````````````` example -- one - - two -. -
-
one
-
-
two
-```````````````````````````````` - - -```````````````````````````````` example -- one - - two -. -
-
-
one
-
two
-
-
-```````````````````````````````` - - -```````````````````````````````` example - - one - - two -. -
-
one
-
-
two -
-```````````````````````````````` - - -```````````````````````````````` example - - one - - two -. -
-
-
one
-
two
-
-
-```````````````````````````````` - - -It is tempting to think of this in terms of columns: the continuation -blocks must be indented at least to the column of the first -[non-whitespace character] after the list marker. However, that is not quite right. -The spaces after the list marker determine how much relative indentation -is needed. Which column this indentation reaches will depend on -how the list item is embedded in other constructions, as shown by -this example: - -```````````````````````````````` example - > > 1. one ->> ->> two -. -
-
-
-
-
one
-
two
-
-
-
-
-```````````````````````````````` - - -Here `two` occurs in the same column as the list marker `1.`, -but is actually contained in the list item, because there is -sufficient indentation after the last containing blockquote marker. - -The converse is also possible. In the following example, the word `two` -occurs far to the right of the initial text of the list item, `one`, but -it is not considered part of the list item, because it is not indented -far enough past the blockquote marker: - -```````````````````````````````` example ->>- one ->> - > > two -. -
-
-
-
one
-
-
two
-
-
-```````````````````````````````` - - -Note that at least one space is needed between the list marker and -any following content, so these are not list items: - -```````````````````````````````` example --one - -2.two -. -
-one
-
2.two
-```````````````````````````````` - - -A list item may not contain blocks that are separated by more than -one blank line. Thus, two blank lines will end a list, unless the -two blanks are contained in a [fenced code block]. - -```````````````````````````````` example -- foo - - bar - -- foo - - - bar - -- ``` - foo - - - bar - ``` - -- baz - - + ``` - foo - - - bar - ``` -. -
-
-
foo
-
bar
-
-
-
foo
-
-
-
bar
-
-
-
foo - - -bar -
-
-
-
baz
-
-
-
foo - - -bar -
-
-
-
-
-```````````````````````````````` - - -A list item may contain any kind of block: - -```````````````````````````````` example -1. foo - - ``` - bar - ``` - - baz - - > bam -. -
-
-
foo
-
bar -
-
baz
-
-
bam
-
-
-
-```````````````````````````````` - - -A list item that contains an indented code block will preserve -empty lines within the code block verbatim, unless there are two -or more empty lines in a row (since as described above, two -blank lines end the list): - -```````````````````````````````` example -- Foo - - bar - - baz -. -
-
-
Foo
-
bar - -baz -
-
-
-```````````````````````````````` - - -```````````````````````````````` example -- Foo - - bar - - - baz -. -
-
-
Foo
-
bar -
-
-
-
baz -
-```````````````````````````````` - - -Note that ordered list start numbers must be nine digits or less: - -```````````````````````````````` example -123456789. ok -. -
-
ok
-
-```````````````````````````````` - - -```````````````````````````````` example -1234567890. not ok -. -
1234567890. not ok
-```````````````````````````````` - - -A start number may begin with 0s: - -```````````````````````````````` example -0. ok -. -
-
ok
-
-```````````````````````````````` - - -```````````````````````````````` example -003. ok -. -
-
ok
-
-```````````````````````````````` - - -A start number may not be negative: - -```````````````````````````````` example --1. not ok -. -
-1. not ok
-```````````````````````````````` - - - -2. **Item starting with indented code.** If a sequence of lines *Ls* - constitute a sequence of blocks *Bs* starting with an indented code - block and not separated from each other by more than one blank line, - and *M* is a list marker of width *W* followed by - one space, then the result of prepending *M* and the following - space to the first line of *Ls*, and indenting subsequent lines of - *Ls* by *W + 1* spaces, is a list item with *Bs* as its contents. - If a line is empty, then it need not be indented. The type of the - list item (bullet or ordered) is determined by the type of its list - marker. If the list item is ordered, then it is also assigned a - start number, based on the ordered list marker. - -An indented code block will have to be indented four spaces beyond -the edge of the region where text will be included in the list item. -In the following case that is 6 spaces: - -```````````````````````````````` example -- foo - - bar -. -
-
-
foo
-
bar -
-
-
-```````````````````````````````` - - -And in this case it is 11 spaces: - -```````````````````````````````` example - 10. foo - - bar -. -
-
-
foo
-
bar -
-
-
-```````````````````````````````` - - -If the *first* block in the list item is an indented code block, -then by rule #2, the contents must be indented *one* space after the -list marker: - -```````````````````````````````` example - indented code - -paragraph - - more code -. -
indented code -
-
paragraph
-
more code -
-```````````````````````````````` - - -```````````````````````````````` example -1. indented code - - paragraph - - more code -. -
-
-
indented code -
-
paragraph
-
more code -
-
-
-```````````````````````````````` - - -Note that an additional space indent is interpreted as space -inside the code block: - -```````````````````````````````` example -1. indented code - - paragraph - - more code -. -
-
-
indented code -
-
paragraph
-
more code -
-
-
-```````````````````````````````` - - -Note that rules #1 and #2 only apply to two cases: (a) cases -in which the lines to be included in a list item begin with a -[non-whitespace character], and (b) cases in which -they begin with an indented code -block. In a case like the following, where the first block begins with -a three-space indent, the rules do not allow us to form a list item by -indenting the whole thing and prepending a list marker: - -```````````````````````````````` example - foo - -bar -. -
foo
-
bar
-```````````````````````````````` - - -```````````````````````````````` example -- foo - - bar -. -
-
foo
-
-
bar
-```````````````````````````````` - - -This is not a significant restriction, because when a block begins -with 1-3 spaces indent, the indentation can always be removed without -a change in interpretation, allowing rule #1 to be applied. So, in -the above case: - -```````````````````````````````` example -- foo - - bar -. -
-
-
foo
-
bar
-
-
-```````````````````````````````` - - -3. **Item starting with a blank line.** If a sequence of lines *Ls* - starting with a single [blank line] constitute a (possibly empty) - sequence of blocks *Bs*, not separated from each other by more than - one blank line, and *M* is a list marker of width *W*, - then the result of prepending *M* to the first line of *Ls*, and - indenting subsequent lines of *Ls* by *W + 1* spaces, is a list - item with *Bs* as its contents. - If a line is empty, then it need not be indented. The type of the - list item (bullet or ordered) is determined by the type of its list - marker. If the list item is ordered, then it is also assigned a - start number, based on the ordered list marker. - -Here are some list items that start with a blank line but are not empty: - -```````````````````````````````` example -- - foo -- - ``` - bar - ``` -- - baz -. -
-
foo
-
-
bar -
-
-
-
baz -
-
-
-```````````````````````````````` - -When the list item starts with a blank line, the number of spaces -following the list marker doesn't change the required indentation: - -```````````````````````````````` example -- - foo -. -
-
foo
-
-```````````````````````````````` - - -A list item can begin with at most one blank line. -In the following example, `foo` is not part of the list -item: - -```````````````````````````````` example -- - - foo -. -
-
-
-
foo
-```````````````````````````````` - - -Here is an empty bullet list item: - -```````````````````````````````` example -- foo -- -- bar -. -
-
foo
-
-
bar
-
-```````````````````````````````` - - -It does not matter whether there are spaces following the [list marker]: - -```````````````````````````````` example -- foo -- -- bar -. -
-
foo
-
-
bar
-
-```````````````````````````````` - - -Here is an empty ordered list item: - -```````````````````````````````` example -1. foo -2. -3. bar -. -
-
foo
-
-
bar
-
-```````````````````````````````` - - -A list may start or end with an empty list item: - -```````````````````````````````` example -* -. -
-
-
-```````````````````````````````` - - - -4. **Indentation.** If a sequence of lines *Ls* constitutes a list item - according to rule #1, #2, or #3, then the result of indenting each line - of *Ls* by 1-3 spaces (the same for each line) also constitutes a - list item with the same contents and attributes. If a line is - empty, then it need not be indented. - -Indented one space: - -```````````````````````````````` example - 1. A paragraph - with two lines. - - indented code - - > A block quote. -. -
-
-
A paragraph -with two lines.
-
indented code -
-
-
A block quote.
-
-
-
-```````````````````````````````` - - -Indented two spaces: - -```````````````````````````````` example - 1. A paragraph - with two lines. - - indented code - - > A block quote. -. -
-
-
A paragraph -with two lines.
-
indented code -
-
-
A block quote.
-
-
-
-```````````````````````````````` - - -Indented three spaces: - -```````````````````````````````` example - 1. A paragraph - with two lines. - - indented code - - > A block quote. -. -
-
-
A paragraph -with two lines.
-
indented code -
-
-
A block quote.
-
-
-
-```````````````````````````````` - - -Four spaces indent gives a code block: - -```````````````````````````````` example - 1. A paragraph - with two lines. - - indented code - - > A block quote. -. -
1. A paragraph - with two lines. - - indented code - - > A block quote. -
-```````````````````````````````` - - - -5. **Laziness.** If a string of lines *Ls* constitute a [list - item](#list-items) with contents *Bs*, then the result of deleting - some or all of the indentation from one or more lines in which the - next [non-whitespace character] after the indentation is - [paragraph continuation text] is a - list item with the same contents and attributes. The unindented - lines are called - [lazy continuation line](@)s. - -Here is an example with [lazy continuation lines]: - -```````````````````````````````` example - 1. A paragraph -with two lines. - - indented code - - > A block quote. -. -
-
-
A paragraph -with two lines.
-
indented code -
-
-
A block quote.
-
-
-
-```````````````````````````````` - - -Indentation can be partially deleted: - -```````````````````````````````` example - 1. A paragraph - with two lines. -. -
-
A paragraph -with two lines.
-
-```````````````````````````````` - - -These examples show how laziness can work in nested structures: - -```````````````````````````````` example -> 1. > Blockquote -continued here. -. -
-
-
-
-
Blockquote -continued here.
-
-
-
-
-```````````````````````````````` - - -```````````````````````````````` example -> 1. > Blockquote -> continued here. -. -
-
-
-
-
Blockquote -continued here.
-
-
-
-
-```````````````````````````````` - - - -6. **That's all.** Nothing that is not counted as a list item by rules - #1--5 counts as a [list item](#list-items). - -The rules for sublists follow from the general rules above. A sublist -must be indented the same number of spaces a paragraph would need to be -in order to be included in the list item. - -So, in this case we need two spaces indent: - -```````````````````````````````` example -- foo - - bar - - baz -. -
-
foo -
-
bar -
-
baz
-
-
-
-
-
-```````````````````````````````` - - -One is not enough: - -```````````````````````````````` example -- foo - - bar - - baz -. -
-
foo
-
bar
-
baz
-
-```````````````````````````````` - - -Here we need four, because the list marker is wider: - -```````````````````````````````` example -10) foo - - bar -. -
-
foo -
-
bar
-
-
-
-```````````````````````````````` - - -Three is not enough: - -```````````````````````````````` example -10) foo - - bar -. -
-
foo
-
-
-
bar
-
-```````````````````````````````` - - -A list may be the first block in a list item: - -```````````````````````````````` example -- - foo -. -
-
-
-
foo
-
-
-
-```````````````````````````````` - - -```````````````````````````````` example -1. - 2. foo -. -
-
-
-
-
-
foo
-
-
-
-
-
-```````````````````````````````` - - -A list item can contain a heading: - -```````````````````````````````` example -- # Foo -- Bar - --- - baz -. -
-
-
Foo
-
-
-
Bar
-baz
-
-```````````````````````````````` - - -### Motivation - -John Gruber's Markdown spec says the following about list items: - -1. "List markers typically start at the left margin, but may be indented - by up to three spaces. List markers must be followed by one or more - spaces or a tab." - -2. "To make lists look nice, you can wrap items with hanging indents.... - But if you don't want to, you don't have to." - -3. "List items may consist of multiple paragraphs. Each subsequent - paragraph in a list item must be indented by either 4 spaces or one - tab." - -4. "It looks nice if you indent every line of the subsequent paragraphs, - but here again, Markdown will allow you to be lazy." - -5. "To put a blockquote within a list item, the blockquote's `>` - delimiters need to be indented." - -6. "To put a code block within a list item, the code block needs to be - indented twice â 8 spaces or two tabs." - -These rules specify that a paragraph under a list item must be indented -four spaces (presumably, from the left margin, rather than the start of -the list marker, but this is not said), and that code under a list item -must be indented eight spaces instead of the usual four. They also say -that a block quote must be indented, but not by how much; however, the -example given has four spaces indentation. Although nothing is said -about other kinds of block-level content, it is certainly reasonable to -infer that *all* block elements under a list item, including other -lists, must be indented four spaces. This principle has been called the -*four-space rule*. - -The four-space rule is clear and principled, and if the reference -implementation `Markdown.pl` had followed it, it probably would have -become the standard. However, `Markdown.pl` allowed paragraphs and -sublists to start with only two spaces indentation, at least on the -outer level. Worse, its behavior was inconsistent: a sublist of an -outer-level list needed two spaces indentation, but a sublist of this -sublist needed three spaces. It is not surprising, then, that different -implementations of Markdown have developed very different rules for -determining what comes under a list item. (Pandoc and python-Markdown, -for example, stuck with Gruber's syntax description and the four-space -rule, while discount, redcarpet, marked, PHP Markdown, and others -followed `Markdown.pl`'s behavior more closely.) - -Unfortunately, given the divergences between implementations, there -is no way to give a spec for list items that will be guaranteed not -to break any existing documents. However, the spec given here should -correctly handle lists formatted with either the four-space rule or -the more forgiving `Markdown.pl` behavior, provided they are laid out -in a way that is natural for a human to read. - -The strategy here is to let the width and indentation of the list marker -determine the indentation necessary for blocks to fall under the list -item, rather than having a fixed and arbitrary number. The writer can -think of the body of the list item as a unit which gets indented to the -right enough to fit the list marker (and any indentation on the list -marker). (The laziness rule, #5, then allows continuation lines to be -unindented if needed.) - -This rule is superior, we claim, to any rule requiring a fixed level of -indentation from the margin. The four-space rule is clear but -unnatural. It is quite unintuitive that - -``` markdown -- foo - - bar - - - baz -``` - -should be parsed as two lists with an intervening paragraph, - -``` html -
-
foo
-
-
bar
-
-
baz
-
-``` - -as the four-space rule demands, rather than a single list, - -``` html -
-
-
foo
-
bar
-
-
baz
-
-
-
-``` - -The choice of four spaces is arbitrary. It can be learned, but it is -not likely to be guessed, and it trips up beginners regularly. - -Would it help to adopt a two-space rule? The problem is that such -a rule, together with the rule allowing 1--3 spaces indentation of the -initial list marker, allows text that is indented *less than* the -original list marker to be included in the list item. For example, -`Markdown.pl` parses - -``` markdown - - one - - two -``` - -as a single list item, with `two` a continuation paragraph: - -``` html -
-
-
one
-
two
-
-
-``` - -and similarly - -``` markdown -> - one -> -> two -``` - -as - -``` html -
-
-
-
one
-
two
-
-
-
-``` - -This is extremely unintuitive. - -Rather than requiring a fixed indent from the margin, we could require -a fixed indent (say, two spaces, or even one space) from the list marker (which -may itself be indented). This proposal would remove the last anomaly -discussed. Unlike the spec presented above, it would count the following -as a list item with a subparagraph, even though the paragraph `bar` -is not indented as far as the first paragraph `foo`: - -``` markdown - 10. foo - - bar -``` - -Arguably this text does read like a list item with `bar` as a subparagraph, -which may count in favor of the proposal. However, on this proposal indented -code would have to be indented six spaces after the list marker. And this -would break a lot of existing Markdown, which has the pattern: - -``` markdown -1. foo - - indented code -``` - -where the code is indented eight spaces. The spec above, by contrast, will -parse this text as expected, since the code block's indentation is measured -from the beginning of `foo`. - -The one case that needs special treatment is a list item that *starts* -with indented code. How much indentation is required in that case, since -we don't have a "first paragraph" to measure from? Rule #2 simply stipulates -that in such cases, we require one space indentation from the list marker -(and then the normal four spaces for the indented code). This will match the -four-space rule in cases where the list marker plus its initial indentation -takes four spaces (a common case), but diverge in other cases. - -## Lists - -A [list](@) is a sequence of one or more -list items [of the same type]. The list items -may be separated by single [blank lines], but two -blank lines end all containing lists. - -Two list items are [of the same type](@) -if they begin with a [list marker] of the same type. -Two list markers are of the -same type if (a) they are bullet list markers using the same character -(`-`, `+`, or `*`) or (b) they are ordered list numbers with the same -delimiter (either `.` or `)`). - -A list is an [ordered list](@) -if its constituent list items begin with -[ordered list markers], and a -[bullet list](@) if its constituent list -items begin with [bullet list markers]. - -The [start number](@) -of an [ordered list] is determined by the list number of -its initial list item. The numbers of subsequent list items are -disregarded. - -A list is [loose](@) if any of its constituent -list items are separated by blank lines, or if any of its constituent -list items directly contain two block-level elements with a blank line -between them. Otherwise a list is [tight](@). -(The difference in HTML output is that paragraphs in a loose list are -wrapped in `
` tags, while paragraphs in a tight list are not.) - -Changing the bullet or ordered list delimiter starts a new list: - -```````````````````````````````` example -- foo -- bar -+ baz -. -
-
foo
-
bar
-
-
-
baz
-
-```````````````````````````````` - - -```````````````````````````````` example -1. foo -2. bar -3) baz -. -
-
foo
-
bar
-
-
-
baz
-
-```````````````````````````````` - - -In CommonMark, a list can interrupt a paragraph. That is, -no blank line is needed to separate a paragraph from a following -list: - -```````````````````````````````` example -Foo -- bar -- baz -. -
Foo
-
-
bar
-
baz
-
-```````````````````````````````` - - -`Markdown.pl` does not allow this, through fear of triggering a list -via a numeral in a hard-wrapped line: - -```````````````````````````````` example -The number of windows in my house is -14. The number of doors is 6. -. -
The number of windows in my house is
-
-
The number of doors is 6.
-
-```````````````````````````````` - - -Oddly, `Markdown.pl` *does* allow a blockquote to interrupt a paragraph, -even though the same considerations might apply. We think that the two -cases should be treated the same. Here are two reasons for allowing -lists to interrupt paragraphs: - -First, it is natural and not uncommon for people to start lists without -blank lines: - - I need to buy - - new shoes - - a coat - - a plane ticket - -Second, we are attracted to a - -> [principle of uniformity](@): -> if a chunk of text has a certain -> meaning, it will continue to have the same meaning when put into a -> container block (such as a list item or blockquote). - -(Indeed, the spec for [list items] and [block quotes] presupposes -this principle.) This principle implies that if - - * I need to buy - - new shoes - - a coat - - a plane ticket - -is a list item containing a paragraph followed by a nested sublist, -as all Markdown implementations agree it is (though the paragraph -may be rendered without `
` tags, since the list is "tight"), -then - - I need to buy - - new shoes - - a coat - - a plane ticket - -by itself should be a paragraph followed by a nested sublist. - -Our adherence to the [principle of uniformity] -thus inclines us to think that there are two coherent packages: - -1. Require blank lines before *all* lists and blockquotes, - including lists that occur as sublists inside other list items. - -2. Require blank lines in none of these places. - -[reStructuredText](http://docutils.sourceforge.net/rst.html) takes -the first approach, for which there is much to be said. But the second -seems more consistent with established practice with Markdown. - -There can be blank lines between items, but two blank lines end -a list: - -```````````````````````````````` example -- foo - -- bar - - -- baz -. -
-
-
foo
-
-
-
bar
-
-
-
-
baz
-
-```````````````````````````````` - - -As illustrated above in the section on [list items], -two blank lines between blocks *within* a list item will also end a -list: - -```````````````````````````````` example -- foo - - - bar -- baz -. -
-
foo
-
-
bar
-
-
baz
-
-```````````````````````````````` - - -Indeed, two blank lines will end *all* containing lists: - -```````````````````````````````` example -- foo - - bar - - baz - - - bim -. -
-
foo -
-
bar -
-
baz
-
-
-
-
-
-
bim -
-```````````````````````````````` - - -Thus, two blank lines can be used to separate consecutive lists of -the same type, or to separate a list from an indented code block -that would otherwise be parsed as a subparagraph of the final list -item: - -```````````````````````````````` example -- foo -- bar - - -- baz -- bim -. -
-
foo
-
bar
-
-
-
baz
-
bim
-
-```````````````````````````````` - - -```````````````````````````````` example -- foo - - notcode - -- foo - - - code -. -
-
-
foo
-
notcode
-
-
-
foo
-
-
-
code -
-```````````````````````````````` - - -List items need not be indented to the same level. The following -list items will be treated as items at the same list level, -since none is indented enough to belong to the previous list -item: - -```````````````````````````````` example -- a - - b - - c - - d - - e - - f - - g - - h -- i -. -
-
a
-
b
-
c
-
d
-
e
-
f
-
g
-
h
-
i
-
-```````````````````````````````` - - -```````````````````````````````` example -1. a - - 2. b - - 3. c -. -
-
-
a
-
-
-
b
-
-
-
c
-
-
-```````````````````````````````` - - -This is a loose list, because there is a blank line between -two of the list items: - -```````````````````````````````` example -- a -- b - -- c -. -
-
-
a
-
-
-
b
-
-
-
c
-
-
-```````````````````````````````` - - -So is this, with a empty second item: - -```````````````````````````````` example -* a -* - -* c -. -
-
-
a
-
-
-
-
c
-
-
-```````````````````````````````` - - -These are loose lists, even though there is no space between the items, -because one of the items directly contains two block-level elements -with a blank line between them: - -```````````````````````````````` example -- a -- b - - c -- d -. -
-
-
a
-
-
-
b
-
c
-
-
-
d
-
-
-```````````````````````````````` - - -```````````````````````````````` example -- a -- b - - [ref]: /url -- d -. -
-
-
a
-
-
-
b
-
-
-
d
-
-
-```````````````````````````````` - - -This is a tight list, because the blank lines are in a code block: - -```````````````````````````````` example -- a -- ``` - b - - - ``` -- c -. -
-
a
-
-
b - - -
-
-
c
-
-```````````````````````````````` - - -This is a tight list, because the blank line is between two -paragraphs of a sublist. So the sublist is loose while -the outer list is tight: - -```````````````````````````````` example -- a - - b - - c -- d -. -
-
a -
-
-
b
-
c
-
-
-
-
d
-
-```````````````````````````````` - - -This is a tight list, because the blank line is inside the -block quote: - -```````````````````````````````` example -* a - > b - > -* c -. -
-
a -
-
b
-
-
-
c
-
-```````````````````````````````` - - -This list is tight, because the consecutive block elements -are not separated by blank lines: - -```````````````````````````````` example -- a - > b - ``` - c - ``` -- d -. -
-
a -
-
b
-
-
c -
-
-
d
-
-```````````````````````````````` - - -A single-paragraph list is tight: - -```````````````````````````````` example -- a -. -
-
a
-
-```````````````````````````````` - - -```````````````````````````````` example -- a - - b -. -
-
a -
-
b
-
-
-
-```````````````````````````````` - - -This list is loose, because of the blank line between the -two block elements in the list item: - -```````````````````````````````` example -1. ``` - foo - ``` - - bar -. -
-
-
foo -
-
bar
-
-
-```````````````````````````````` - - -Here the outer list is loose, the inner list tight: - -```````````````````````````````` example -* foo - * bar - - baz -. -
-
-
foo
-
-
bar
-
-
baz
-
-
-```````````````````````````````` - - -```````````````````````````````` example -- a - - b - - c - -- d - - e - - f -. -
-
-
a
-
-
b
-
c
-
-
-
-
d
-
-
e
-
f
-
-
-
-```````````````````````````````` - - -# Inlines - -Inlines are parsed sequentially from the beginning of the character -stream to the end (left to right, in left-to-right languages). -Thus, for example, in - -```````````````````````````````` example -`hi`lo` -. -
hilo`
-```````````````````````````````` - - -`hi` is parsed as code, leaving the backtick at the end as a literal -backtick. - -## Backslash escapes - -Any ASCII punctuation character may be backslash-escaped: - -```````````````````````````````` example -\!\"\#\$\%\&\'\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~ -. -
!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
-```````````````````````````````` - - -Backslashes before other characters are treated as literal -backslashes: - -```````````````````````````````` example -\â\A\a\ \3\Ï\Â« -. -
\â\A\a\ \3\Ï\Â«
-```````````````````````````````` - - -Escaped characters are treated as regular characters and do -not have their usual Markdown meanings: - -```````````````````````````````` example -\*not emphasized* -\
not a tag -\[not a link](/foo) -\`not code` -1\. not a list -\* not a list -\# not a heading -\[foo]: /url "not a reference" -. -
*not emphasized* -<br/> not a tag -[not a link](/foo) -`not code` -1. not a list -* not a list -# not a heading -[foo]: /url "not a reference"
-```````````````````````````````` - - -If a backslash is itself escaped, the following character is not: - -```````````````````````````````` example -\\*emphasis* -. -
\emphasis
-```````````````````````````````` - - -A backslash at the end of the line is a [hard line break]: - -```````````````````````````````` example -foo\ -bar -. -
foo
-bar
-```````````````````````````````` - - -Backslash escapes do not work in code blocks, code spans, autolinks, or -raw HTML: - -```````````````````````````````` example -`` \[\` `` -. -
\[\`
-```````````````````````````````` - - -```````````````````````````````` example - \[\] -. -
\[\] -
-```````````````````````````````` - - -```````````````````````````````` example -~~~ -\[\] -~~~ -. -
\[\] -
-```````````````````````````````` - - -```````````````````````````````` example - -. -
http://example.com?find=\*
-```````````````````````````````` - - -```````````````````````````````` example - -. - -```````````````````````````````` - - -But they work in all other contexts, including URLs and link titles, -link references, and [info strings] in [fenced code blocks]: - -```````````````````````````````` example -[foo](/bar\* "ti\*tle") -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -[foo] - -[foo]: /bar\* "ti\*tle" -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -``` foo\+bar -foo -``` -. -
foo -
-```````````````````````````````` - - - -## Entity and numeric character references - -All valid HTML entity references and numeric character -references, except those occuring in code blocks and code spans, -are recognized as such and treated as equivalent to the -corresponding Unicode characters. Conforming CommonMark parsers -need not store information about whether a particular character -was represented in the source using a Unicode character or -an entity reference. - -[Entity references](@) consist of `&` + any of the valid -HTML5 entity names + `;`. The -document -is used as an authoritative source for the valid entity -references and their corresponding code points. - -```````````````````````````````` example - & © Æ Ď -¾ ℋ ⅆ -∲ ≧̸ -. -
Â & Â© Ã Ä -Â¾ â â -â² â§Ì¸
-```````````````````````````````` - - -[Decimal numeric character -references](@) -consist of `&#` + a string of 1--8 arabic digits + `;`. A -numeric character reference is parsed as the corresponding -Unicode character. Invalid Unicode code points will be replaced by -the REPLACEMENT CHARACTER (`U+FFFD`). For security reasons, -the code point `U+0000` will also be replaced by `U+FFFD`. - -```````````````````````````````` example -# Ӓ Ϡ � � -. -
# Ó Ï ï¿½ ï¿½
-```````````````````````````````` - - -[Hexadecimal numeric character -references](@) consist of `&#` + -either `X` or `x` + a string of 1-8 hexadecimal digits + `;`. -They too are parsed as the corresponding Unicode character (this -time specified with a hexadecimal numeral instead of decimal). - -```````````````````````````````` example -" ആ ಫ -. -
" à´ à²«
-```````````````````````````````` - - -Here are some nonentities: - -```````````````````````````````` example - &x; &#; &#x; -&ThisIsNotDefined; &hi?; -. -
&nbsp &x; &#; &#x; -&ThisIsNotDefined; &hi?;
-```````````````````````````````` - - -Although HTML5 does accept some entity references -without a trailing semicolon (such as `©`), these are not -recognized here, because it makes the grammar too ambiguous: - -```````````````````````````````` example -© -. -
&copy
-```````````````````````````````` - - -Strings that are not on the list of HTML5 named entities are not -recognized as entity references either: - -```````````````````````````````` example -&MadeUpEntity; -. -
&MadeUpEntity;
-```````````````````````````````` - - -Entity and numeric character references are recognized in any -context besides code spans or code blocks, including -URLs, [link titles], and [fenced code block][] [info strings]: - -```````````````````````````````` example - -. - -```````````````````````````````` - - -```````````````````````````````` example -[foo](/föö "föö") -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -[foo] - -[foo]: /föö "föö" -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -``` föö -foo -``` -. -
foo -
-```````````````````````````````` - - -Entity and numeric character references are treated as literal -text in code spans and code blocks: - -```````````````````````````````` example -`föö` -. -
föö
-```````````````````````````````` - - -```````````````````````````````` example - föfö -. -
föfö -
-```````````````````````````````` - - -## Code spans - -A [backtick string](@) -is a string of one or more backtick characters (`` ` ``) that is neither -preceded nor followed by a backtick. - -A [code span](@) begins with a backtick string and ends with -a backtick string of equal length. The contents of the code span are -the characters between the two backtick strings, with leading and -trailing spaces and [line endings] removed, and -[whitespace] collapsed to single spaces. - -This is a simple code span: - -```````````````````````````````` example -`foo` -. -
foo
-```````````````````````````````` - - -Here two backticks are used, because the code contains a backtick. -This example also illustrates stripping of leading and trailing spaces: - -```````````````````````````````` example -`` foo ` bar `` -. -
foo ` bar
-```````````````````````````````` - - -This example shows the motivation for stripping leading and trailing -spaces: - -```````````````````````````````` example -` `` ` -. -
``
-```````````````````````````````` - - -[Line endings] are treated like spaces: - -```````````````````````````````` example -`` -foo -`` -. -
foo
-```````````````````````````````` - - -Interior spaces and [line endings] are collapsed into -single spaces, just as they would be by a browser: - -```````````````````````````````` example -`foo bar - baz` -. -
foo bar baz
-```````````````````````````````` - - -Q: Why not just leave the spaces, since browsers will collapse them -anyway? A: Because we might be targeting a non-HTML format, and we -shouldn't rely on HTML-specific rendering assumptions. - -(Existing implementations differ in their treatment of internal -spaces and [line endings]. Some, including `Markdown.pl` and -`showdown`, convert an internal [line ending] into a -`
` tag. But this makes things difficult for those who like to -hard-wrap their paragraphs, since a line break in the midst of a code -span will cause an unintended line break in the output. Others just -leave internal spaces as they are, which is fine if only HTML is being -targeted.) - -```````````````````````````````` example -`foo `` bar` -. -
foo `` bar
-```````````````````````````````` - - -Note that backslash escapes do not work in code spans. All backslashes -are treated literally: - -```````````````````````````````` example -`foo\`bar` -. -
foo\bar`
-```````````````````````````````` - - -Backslash escapes are never needed, because one can always choose a -string of *n* backtick characters as delimiters, where the code does -not contain any strings of exactly *n* backtick characters. - -Code span backticks have higher precedence than any other inline -constructs except HTML tags and autolinks. Thus, for example, this is -not parsed as emphasized text, since the second `*` is part of a code -span: - -```````````````````````````````` example -*foo`*` -. -
*foo*
-```````````````````````````````` - - -And this is not parsed as a link: - -```````````````````````````````` example -[not a `link](/foo`) -. -
[not a link](/foo)
-```````````````````````````````` - - -Code spans, HTML tags, and autolinks have the same precedence. -Thus, this is code: - -```````````````````````````````` example -`` -. -
<a href="">`
-```````````````````````````````` - - -But this is an HTML tag: - -```````````````````````````````` example -` -. -
`
-```````````````````````````````` - - -And this is code: - -```````````````````````````````` example -`` -. -
<http://foo.bar.baz>`
-```````````````````````````````` - - -But this is an autolink: - -```````````````````````````````` example -` -. -
http://foo.bar.`baz`
-```````````````````````````````` - - -When a backtick string is not closed by a matching backtick string, -we just have literal backticks: - -```````````````````````````````` example -```foo`` -. -
```foo``
-```````````````````````````````` - - -```````````````````````````````` example -`foo -. -
`foo
-```````````````````````````````` - - -## Emphasis and strong emphasis - -John Gruber's original [Markdown syntax -description](http://daringfireball.net/projects/markdown/syntax#em) says: - -> Markdown treats asterisks (`*`) and underscores (`_`) as indicators of -> emphasis. Text wrapped with one `*` or `_` will be wrapped with an HTML -> `` tag; double `*`'s or `_`'s will be wrapped with an HTML `` -> tag. - -This is enough for most users, but these rules leave much undecided, -especially when it comes to nested emphasis. The original -`Markdown.pl` test suite makes it clear that triple `***` and -`___` delimiters can be used for strong emphasis, and most -implementations have also allowed the following patterns: - -``` markdown -***strong emph*** -***strong** in emph* -***emph* in strong** -**in strong *emph*** -*in emph **strong*** -``` - -The following patterns are less widely supported, but the intent -is clear and they are useful (especially in contexts like bibliography -entries): - -``` markdown -*emph *with emph* in it* -**strong **with strong** in it** -``` - -Many implementations have also restricted intraword emphasis to -the `*` forms, to avoid unwanted emphasis in words containing -internal underscores. (It is best practice to put these in code -spans, but users often do not.) - -``` markdown -internal emphasis: foo*bar*baz -no emphasis: foo_bar_baz -``` - -The rules given below capture all of these patterns, while allowing -for efficient parsing strategies that do not backtrack. - -First, some definitions. A [delimiter run](@) is either -a sequence of one or more `*` characters that is not preceded or -followed by a `*` character, or a sequence of one or more `_` -characters that is not preceded or followed by a `_` character. - -A [left-flanking delimiter run](@) is -a [delimiter run] that is (a) not followed by [Unicode whitespace], -and (b) either not followed by a [punctuation character], or -preceded by [Unicode whitespace] or a [punctuation character]. -For purposes of this definition, the beginning and the end of -the line count as Unicode whitespace. - -A [right-flanking delimiter run](@) is -a [delimiter run] that is (a) not preceded by [Unicode whitespace], -and (b) either not preceded by a [punctuation character], or -followed by [Unicode whitespace] or a [punctuation character]. -For purposes of this definition, the beginning and the end of -the line count as Unicode whitespace. - -Here are some examples of delimiter runs. - - - left-flanking but not right-flanking: - - ``` - ***abc - _abc - **"abc" - _"abc" - ``` - - - right-flanking but not left-flanking: - - ``` - abc*** - abc_ - "abc"** - "abc"_ - ``` - - - Both left and right-flanking: - - ``` - abc***def - "abc"_"def" - ``` - - - Neither left nor right-flanking: - - ``` - abc *** def - a _ b - ``` - -(The idea of distinguishing left-flanking and right-flanking -delimiter runs based on the character before and the character -after comes from Roopesh Chander's -[vfmd](http://www.vfmd.org/vfmd-spec/specification/#procedure-for-identifying-emphasis-tags). -vfmd uses the terminology "emphasis indicator string" instead of "delimiter -run," and its rules for distinguishing left- and right-flanking runs -are a bit more complex than the ones given here.) - -The following rules define emphasis and strong emphasis: - -1. A single `*` character [can open emphasis](@) - iff (if and only if) it is part of a [left-flanking delimiter run]. - -2. A single `_` character [can open emphasis] iff - it is part of a [left-flanking delimiter run] - and either (a) not part of a [right-flanking delimiter run] - or (b) part of a [right-flanking delimiter run] - preceded by punctuation. - -3. A single `*` character [can close emphasis](@) - iff it is part of a [right-flanking delimiter run]. - -4. A single `_` character [can close emphasis] iff - it is part of a [right-flanking delimiter run] - and either (a) not part of a [left-flanking delimiter run] - or (b) part of a [left-flanking delimiter run] - followed by punctuation. - -5. A double `**` [can open strong emphasis](@) - iff it is part of a [left-flanking delimiter run]. - -6. A double `__` [can open strong emphasis] iff - it is part of a [left-flanking delimiter run] - and either (a) not part of a [right-flanking delimiter run] - or (b) part of a [right-flanking delimiter run] - preceded by punctuation. - -7. A double `**` [can close strong emphasis](@) - iff it is part of a [right-flanking delimiter run]. - -8. A double `__` [can close strong emphasis] - it is part of a [right-flanking delimiter run] - and either (a) not part of a [left-flanking delimiter run] - or (b) part of a [left-flanking delimiter run] - followed by punctuation. - -9. Emphasis begins with a delimiter that [can open emphasis] and ends - with a delimiter that [can close emphasis], and that uses the same - character (`_` or `*`) as the opening delimiter. There must - be a nonempty sequence of inlines between the open delimiter - and the closing delimiter; these form the contents of the emphasis - inline. - -10. Strong emphasis begins with a delimiter that - [can open strong emphasis] and ends with a delimiter that - [can close strong emphasis], and that uses the same character - (`_` or `*`) as the opening delimiter. - There must be a nonempty sequence of inlines between the open - delimiter and the closing delimiter; these form the contents of - the strong emphasis inline. - -11. A literal `*` character cannot occur at the beginning or end of - `*`-delimited emphasis or `**`-delimited strong emphasis, unless it - is backslash-escaped. - -12. A literal `_` character cannot occur at the beginning or end of - `_`-delimited emphasis or `__`-delimited strong emphasis, unless it - is backslash-escaped. - -Where rules 1--12 above are compatible with multiple parsings, -the following principles resolve ambiguity: - -13. The number of nestings should be minimized. Thus, for example, - an interpretation `...` is always preferred to - `...`. - -14. An interpretation `...` is always - preferred to `..`. - -15. When two potential emphasis or strong emphasis spans overlap, - so that the second begins before the first ends and ends after - the first ends, the first takes precedence. Thus, for example, - `*foo _bar* baz_` is parsed as `foo _bar baz_` rather - than `*foo bar* baz`. For the same reason, - `**foo*bar**` is parsed as `foobar*` - rather than `foo*bar`. - -16. When there are two potential emphasis or strong emphasis spans - with the same closing delimiter, the shorter one (the one that - opens later) takes precedence. Thus, for example, - `**foo **bar baz**` is parsed as `**foo bar baz` - rather than `foo **bar baz`. - -17. Inline code spans, links, images, and HTML tags group more tightly - than emphasis. So, when there is a choice between an interpretation - that contains one of these elements and one that does not, the - former always wins. Thus, for example, `*[foo*](bar)` is - parsed as `*foo*` rather than as - `[foo](bar)`. - -These rules can be illustrated through a series of examples. - -Rule 1: - -```````````````````````````````` example -*foo bar* -. -
foo bar
-```````````````````````````````` - - -This is not emphasis, because the opening `*` is followed by -whitespace, and hence not part of a [left-flanking delimiter run]: - -```````````````````````````````` example -a * foo bar* -. -
a * foo bar*
-```````````````````````````````` - - -This is not emphasis, because the opening `*` is preceded -by an alphanumeric and followed by punctuation, and hence -not part of a [left-flanking delimiter run]: - -```````````````````````````````` example -a*"foo"* -. -
a*"foo"*
-```````````````````````````````` - - -Unicode nonbreaking spaces count as whitespace, too: - -```````````````````````````````` example -*Â aÂ * -. -
*Â aÂ *
-```````````````````````````````` - - -Intraword emphasis with `*` is permitted: - -```````````````````````````````` example -foo*bar* -. -
foobar
-```````````````````````````````` - - -```````````````````````````````` example -5*6*78 -. -
5678
-```````````````````````````````` - - -Rule 2: - -```````````````````````````````` example -_foo bar_ -. -
foo bar
-```````````````````````````````` - - -This is not emphasis, because the opening `_` is followed by -whitespace: - -```````````````````````````````` example -_ foo bar_ -. -
_ foo bar_
-```````````````````````````````` - - -This is not emphasis, because the opening `_` is preceded -by an alphanumeric and followed by punctuation: - -```````````````````````````````` example -a_"foo"_ -. -
a_"foo"_
-```````````````````````````````` - - -Emphasis with `_` is not allowed inside words: - -```````````````````````````````` example -foo_bar_ -. -
foo_bar_
-```````````````````````````````` - - -```````````````````````````````` example -5_6_78 -. -
5_6_78
-```````````````````````````````` - - -```````````````````````````````` example -Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼_ÑÑÑÐµÐ¼ÑÑÑÑ_ -. -
Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼_ÑÑÑÐµÐ¼ÑÑÑÑ_
-```````````````````````````````` - - -Here `_` does not generate emphasis, because the first delimiter run -is right-flanking and the second left-flanking: - -```````````````````````````````` example -aa_"bb"_cc -. -
aa_"bb"_cc
-```````````````````````````````` - - -This is emphasis, even though the opening delimiter is -both left- and right-flanking, because it is preceded by -punctuation: - -```````````````````````````````` example -foo-_(bar)_ -. -
foo-(bar)
-```````````````````````````````` - - -Rule 3: - -This is not emphasis, because the closing delimiter does -not match the opening delimiter: - -```````````````````````````````` example -_foo* -. -
_foo*
-```````````````````````````````` - - -This is not emphasis, because the closing `*` is preceded by -whitespace: - -```````````````````````````````` example -*foo bar * -. -
*foo bar *
-```````````````````````````````` - - -A newline also counts as whitespace: - -```````````````````````````````` example -*foo bar -* -. -
*foo bar
-
-
-
-```````````````````````````````` - - -This is not emphasis, because the second `*` is -preceded by punctuation and followed by an alphanumeric -(hence it is not part of a [right-flanking delimiter run]: - -```````````````````````````````` example -*(*foo) -. -
*(*foo)
-```````````````````````````````` - - -The point of this restriction is more easily appreciated -with this example: - -```````````````````````````````` example -*(*foo*)* -. -
(foo)
-```````````````````````````````` - - -Intraword emphasis with `*` is allowed: - -```````````````````````````````` example -*foo*bar -. -
foobar
-```````````````````````````````` - - - -Rule 4: - -This is not emphasis, because the closing `_` is preceded by -whitespace: - -```````````````````````````````` example -_foo bar _ -. -
_foo bar _
-```````````````````````````````` - - -This is not emphasis, because the second `_` is -preceded by punctuation and followed by an alphanumeric: - -```````````````````````````````` example -_(_foo) -. -
_(_foo)
-```````````````````````````````` - - -This is emphasis within emphasis: - -```````````````````````````````` example -_(_foo_)_ -. -
(foo)
-```````````````````````````````` - - -Intraword emphasis is disallowed for `_`: - -```````````````````````````````` example -_foo_bar -. -
_foo_bar
-```````````````````````````````` - - -```````````````````````````````` example -_Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼_ÑÑÑÐµÐ¼ÑÑÑÑ -. -
_Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼_ÑÑÑÐµÐ¼ÑÑÑÑ
-```````````````````````````````` - - -```````````````````````````````` example -_foo_bar_baz_ -. -
foo_bar_baz
-```````````````````````````````` - - -This is emphasis, even though the closing delimiter is -both left- and right-flanking, because it is followed by -punctuation: - -```````````````````````````````` example -_(bar)_. -. -
(bar).
-```````````````````````````````` - - -Rule 5: - -```````````````````````````````` example -**foo bar** -. -
foo bar
-```````````````````````````````` - - -This is not strong emphasis, because the opening delimiter is -followed by whitespace: - -```````````````````````````````` example -** foo bar** -. -
** foo bar**
-```````````````````````````````` - - -This is not strong emphasis, because the opening `**` is preceded -by an alphanumeric and followed by punctuation, and hence -not part of a [left-flanking delimiter run]: - -```````````````````````````````` example -a**"foo"** -. -
a**"foo"**
-```````````````````````````````` - - -Intraword strong emphasis with `**` is permitted: - -```````````````````````````````` example -foo**bar** -. -
foobar
-```````````````````````````````` - - -Rule 6: - -```````````````````````````````` example -__foo bar__ -. -
foo bar
-```````````````````````````````` - - -This is not strong emphasis, because the opening delimiter is -followed by whitespace: - -```````````````````````````````` example -__ foo bar__ -. -
__ foo bar__
-```````````````````````````````` - - -A newline counts as whitespace: -```````````````````````````````` example -__ -foo bar__ -. -
__ -foo bar__
-```````````````````````````````` - - -This is not strong emphasis, because the opening `__` is preceded -by an alphanumeric and followed by punctuation: - -```````````````````````````````` example -a__"foo"__ -. -
a__"foo"__
-```````````````````````````````` - - -Intraword strong emphasis is forbidden with `__`: - -```````````````````````````````` example -foo__bar__ -. -
foo__bar__
-```````````````````````````````` - - -```````````````````````````````` example -5__6__78 -. -
5__6__78
-```````````````````````````````` - - -```````````````````````````````` example -Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼__ÑÑÑÐµÐ¼ÑÑÑÑ__ -. -
Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼__ÑÑÑÐµÐ¼ÑÑÑÑ__
-```````````````````````````````` - - -```````````````````````````````` example -__foo, __bar__, baz__ -. -
foo, bar, baz
-```````````````````````````````` - - -This is strong emphasis, even though the opening delimiter is -both left- and right-flanking, because it is preceded by -punctuation: - -```````````````````````````````` example -foo-__(bar)__ -. -
foo-(bar)
-```````````````````````````````` - - - -Rule 7: - -This is not strong emphasis, because the closing delimiter is preceded -by whitespace: - -```````````````````````````````` example -**foo bar ** -. -
**foo bar **
-```````````````````````````````` - - -(Nor can it be interpreted as an emphasized `*foo bar *`, because of -Rule 11.) - -This is not strong emphasis, because the second `**` is -preceded by punctuation and followed by an alphanumeric: - -```````````````````````````````` example -**(**foo) -. -
**(**foo)
-```````````````````````````````` - - -The point of this restriction is more easily appreciated -with these examples: - -```````````````````````````````` example -*(**foo**)* -. -
(foo)
-```````````````````````````````` - - -```````````````````````````````` example -**Gomphocarpus (*Gomphocarpus physocarpus*, syn. -*Asclepias physocarpa*)** -. -
Gomphocarpus (Gomphocarpus physocarpus, syn. -Asclepias physocarpa)
-```````````````````````````````` - - -```````````````````````````````` example -**foo "*bar*" foo** -. -
foo "bar" foo
-```````````````````````````````` - - -Intraword emphasis: - -```````````````````````````````` example -**foo**bar -. -
foobar
-```````````````````````````````` - - -Rule 8: - -This is not strong emphasis, because the closing delimiter is -preceded by whitespace: - -```````````````````````````````` example -__foo bar __ -. -
__foo bar __
-```````````````````````````````` - - -This is not strong emphasis, because the second `__` is -preceded by punctuation and followed by an alphanumeric: - -```````````````````````````````` example -__(__foo) -. -
__(__foo)
-```````````````````````````````` - - -The point of this restriction is more easily appreciated -with this example: - -```````````````````````````````` example -_(__foo__)_ -. -
(foo)
-```````````````````````````````` - - -Intraword strong emphasis is forbidden with `__`: - -```````````````````````````````` example -__foo__bar -. -
__foo__bar
-```````````````````````````````` - - -```````````````````````````````` example -__Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼__ÑÑÑÐµÐ¼ÑÑÑÑ -. -
__Ð¿ÑÐ¸ÑÑÐ°Ð½ÑÐ¼__ÑÑÑÐµÐ¼ÑÑÑÑ
-```````````````````````````````` - - -```````````````````````````````` example -__foo__bar__baz__ -. -
foo__bar__baz
-```````````````````````````````` - - -This is strong emphasis, even though the closing delimiter is -both left- and right-flanking, because it is followed by -punctuation: - -```````````````````````````````` example -__(bar)__. -. -
(bar).
-```````````````````````````````` - - -Rule 9: - -Any nonempty sequence of inline elements can be the contents of an -emphasized span. - -```````````````````````````````` example -*foo [bar](/url)* -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -*foo -bar* -. -
foo -bar
-```````````````````````````````` - - -In particular, emphasis and strong emphasis can be nested -inside emphasis: - -```````````````````````````````` example -_foo __bar__ baz_ -. -
foo bar baz
-```````````````````````````````` - - -```````````````````````````````` example -_foo _bar_ baz_ -. -
foo bar baz
-```````````````````````````````` - - -```````````````````````````````` example -__foo_ bar_ -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -*foo *bar** -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -*foo **bar** baz* -. -
foo bar baz
-```````````````````````````````` - - -But note: - -```````````````````````````````` example -*foo**bar**baz* -. -
foobarbaz
-```````````````````````````````` - - -The difference is that in the preceding case, the internal delimiters -[can close emphasis], while in the cases with spaces, they cannot. - -```````````````````````````````` example -***foo** bar* -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -*foo **bar*** -. -
foo bar
-```````````````````````````````` - - -Note, however, that in the following case we get no strong -emphasis, because the opening delimiter is closed by the first -`*` before `bar`: - -```````````````````````````````` example -*foo**bar*** -. -
foobar**
-```````````````````````````````` - - - -Indefinite levels of nesting are possible: - -```````````````````````````````` example -*foo **bar *baz* bim** bop* -. -
foo bar baz bim bop
-```````````````````````````````` - - -```````````````````````````````` example -*foo [*bar*](/url)* -. -
foo bar
-```````````````````````````````` - - -There can be no empty emphasis or strong emphasis: - -```````````````````````````````` example -** is not an empty emphasis -. -
** is not an empty emphasis
-```````````````````````````````` - - -```````````````````````````````` example -**** is not an empty strong emphasis -. -
**** is not an empty strong emphasis
-```````````````````````````````` - - - -Rule 10: - -Any nonempty sequence of inline elements can be the contents of an -strongly emphasized span. - -```````````````````````````````` example -**foo [bar](/url)** -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -**foo -bar** -. -
foo -bar
-```````````````````````````````` - - -In particular, emphasis and strong emphasis can be nested -inside strong emphasis: - -```````````````````````````````` example -__foo _bar_ baz__ -. -
foo bar baz
-```````````````````````````````` - - -```````````````````````````````` example -__foo __bar__ baz__ -. -
foo bar baz
-```````````````````````````````` - - -```````````````````````````````` example -____foo__ bar__ -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -**foo **bar**** -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -**foo *bar* baz** -. -
foo bar baz
-```````````````````````````````` - - -But note: - -```````````````````````````````` example -**foo*bar*baz** -. -
foobarbaz**
-```````````````````````````````` - - -The difference is that in the preceding case, the internal delimiters -[can close emphasis], while in the cases with spaces, they cannot. - -```````````````````````````````` example -***foo* bar** -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -**foo *bar*** -. -
foo bar
-```````````````````````````````` - - -Indefinite levels of nesting are possible: - -```````````````````````````````` example -**foo *bar **baz** -bim* bop** -. -
foo bar baz -bim bop
-```````````````````````````````` - - -```````````````````````````````` example -**foo [*bar*](/url)** -. -
foo bar
-```````````````````````````````` - - -There can be no empty emphasis or strong emphasis: - -```````````````````````````````` example -__ is not an empty emphasis -. -
__ is not an empty emphasis
-```````````````````````````````` - - -```````````````````````````````` example -____ is not an empty strong emphasis -. -
____ is not an empty strong emphasis
-```````````````````````````````` - - - -Rule 11: - -```````````````````````````````` example -foo *** -. -
foo ***
-```````````````````````````````` - - -```````````````````````````````` example -foo *\** -. -
foo *
-```````````````````````````````` - - -```````````````````````````````` example -foo *_* -. -
foo _
-```````````````````````````````` - - -```````````````````````````````` example -foo ***** -. -
foo *****
-```````````````````````````````` - - -```````````````````````````````` example -foo **\*** -. -
foo *
-```````````````````````````````` - - -```````````````````````````````` example -foo **_** -. -
foo _
-```````````````````````````````` - - -Note that when delimiters do not match evenly, Rule 11 determines -that the excess literal `*` characters will appear outside of the -emphasis, rather than inside it: - -```````````````````````````````` example -**foo* -. -
*foo
-```````````````````````````````` - - -```````````````````````````````` example -*foo** -. -
foo*
-```````````````````````````````` - - -```````````````````````````````` example -***foo** -. -
*foo
-```````````````````````````````` - - -```````````````````````````````` example -****foo* -. -
***foo
-```````````````````````````````` - - -```````````````````````````````` example -**foo*** -. -
foo*
-```````````````````````````````` - - -```````````````````````````````` example -*foo**** -. -
foo***
-```````````````````````````````` - - - -Rule 12: - -```````````````````````````````` example -foo ___ -. -
foo ___
-```````````````````````````````` - - -```````````````````````````````` example -foo _\__ -. -
foo _
-```````````````````````````````` - - -```````````````````````````````` example -foo _*_ -. -
foo *
-```````````````````````````````` - - -```````````````````````````````` example -foo _____ -. -
foo _____
-```````````````````````````````` - - -```````````````````````````````` example -foo __\___ -. -
foo _
-```````````````````````````````` - - -```````````````````````````````` example -foo __*__ -. -
foo *
-```````````````````````````````` - - -```````````````````````````````` example -__foo_ -. -
_foo
-```````````````````````````````` - - -Note that when delimiters do not match evenly, Rule 12 determines -that the excess literal `_` characters will appear outside of the -emphasis, rather than inside it: - -```````````````````````````````` example -_foo__ -. -
foo_
-```````````````````````````````` - - -```````````````````````````````` example -___foo__ -. -
_foo
-```````````````````````````````` - - -```````````````````````````````` example -____foo_ -. -
___foo
-```````````````````````````````` - - -```````````````````````````````` example -__foo___ -. -
foo_
-```````````````````````````````` - - -```````````````````````````````` example -_foo____ -. -
foo___
-```````````````````````````````` - - -Rule 13 implies that if you want emphasis nested directly inside -emphasis, you must use different delimiters: - -```````````````````````````````` example -**foo** -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -*_foo_* -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -__foo__ -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -_*foo*_ -. -
foo
-```````````````````````````````` - - -However, strong emphasis within strong emphasis is possible without -switching delimiters: - -```````````````````````````````` example -****foo**** -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -____foo____ -. -
foo
-```````````````````````````````` - - - -Rule 13 can be applied to arbitrarily long sequences of -delimiters: - -```````````````````````````````` example -******foo****** -. -
foo
-```````````````````````````````` - - -Rule 14: - -```````````````````````````````` example -***foo*** -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -_____foo_____ -. -
foo
-```````````````````````````````` - - -Rule 15: - -```````````````````````````````` example -*foo _bar* baz_ -. -
foo _bar baz_
-```````````````````````````````` - - -```````````````````````````````` example -**foo*bar** -. -
foobar*
-```````````````````````````````` - - -```````````````````````````````` example -*foo __bar *baz bim__ bam* -. -
foo bar *baz bim bam
-```````````````````````````````` - - -Rule 16: - -```````````````````````````````` example -**foo **bar baz** -. -
**foo bar baz
-```````````````````````````````` - - -```````````````````````````````` example -*foo *bar baz* -. -
*foo bar baz
-```````````````````````````````` - - -Rule 17: - -```````````````````````````````` example -*[bar*](/url) -. -
*bar*
-```````````````````````````````` - - -```````````````````````````````` example -_foo [bar_](/url) -. -
_foo bar_
-```````````````````````````````` - - -```````````````````````````````` example -* -. -
*
-```````````````````````````````` - - -```````````````````````````````` example -** -. -
**
-```````````````````````````````` - - -```````````````````````````````` example -__ -. -
__
-```````````````````````````````` - - -```````````````````````````````` example -*a `*`* -. -
a *
-```````````````````````````````` - - -```````````````````````````````` example -_a `_`_ -. -
a _
-```````````````````````````````` - - -```````````````````````````````` example -**a -. -
**a http://foo.bar/?q=**
-```````````````````````````````` - - -```````````````````````````````` example -__a -. -
__ahttp://foo.bar/?q=__
-```````````````````````````````` - - - -## Links - -A link contains [link text] (the visible text), a [link destination] -(the URI that is the link destination), and optionally a [link title]. -There are two basic kinds of links in Markdown. In [inline links] the -destination and title are given immediately after the link text. In -[reference links] the destination and title are defined elsewhere in -the document. - -A [link text](@) consists of a sequence of zero or more -inline elements enclosed by square brackets (`[` and `]`). The -following rules apply: - -- Links may not contain other links, at any level of nesting. If - multiple otherwise valid link definitions appear nested inside each - other, the inner-most definition is used. - -- Brackets are allowed in the [link text] only if (a) they - are backslash-escaped or (b) they appear as a matched pair of brackets, - with an open bracket `[`, a sequence of zero or more inlines, and - a close bracket `]`. - -- Backtick [code spans], [autolinks], and raw [HTML tags] bind more tightly - than the brackets in link text. Thus, for example, - `` [foo`]` `` could not be a link text, since the second `]` - is part of a code span. - -- The brackets in link text bind more tightly than markers for - [emphasis and strong emphasis]. Thus, for example, `*[foo*](url)` is a link. - -A [link destination](@) consists of either - -- a sequence of zero or more characters between an opening `<` and a - closing `>` that contains no spaces, line breaks, or unescaped - `<` or `>` characters, or - -- a nonempty sequence of characters that does not include - ASCII space or control characters, and includes parentheses - only if (a) they are backslash-escaped or (b) they are part of - a balanced pair of unescaped parentheses that is not itself - inside a balanced pair of unescaped parentheses. - -A [link title](@) consists of either - -- a sequence of zero or more characters between straight double-quote - characters (`"`), including a `"` character only if it is - backslash-escaped, or - -- a sequence of zero or more characters between straight single-quote - characters (`'`), including a `'` character only if it is - backslash-escaped, or - -- a sequence of zero or more characters between matching parentheses - (`(...)`), including a `)` character only if it is backslash-escaped. - -Although [link titles] may span multiple lines, they may not contain -a [blank line]. - -An [inline link](@) consists of a [link text] followed immediately -by a left parenthesis `(`, optional [whitespace], an optional -[link destination], an optional [link title] separated from the link -destination by [whitespace], optional [whitespace], and a right -parenthesis `)`. The link's text consists of the inlines contained -in the [link text] (excluding the enclosing square brackets). -The link's URI consists of the link destination, excluding enclosing -`<...>` if present, with backslash-escapes in effect as described -above. The link's title consists of the link title, excluding its -enclosing delimiters, with backslash-escapes in effect as described -above. - -Here is a simple inline link: - -```````````````````````````````` example -[link](/uri "title") -. -
link
-```````````````````````````````` - - -The title may be omitted: - -```````````````````````````````` example -[link](/uri) -. -
link
-```````````````````````````````` - - -Both the title and the destination may be omitted: - -```````````````````````````````` example -[link]() -. -
link
-```````````````````````````````` - - -```````````````````````````````` example -[link](<>) -. -
link
-```````````````````````````````` - - -The destination cannot contain spaces or line breaks, -even if enclosed in pointy brackets: - -```````````````````````````````` example -[link](/my uri) -. -
[link](/my uri)
-```````````````````````````````` - - -```````````````````````````````` example -[link]() -. -
[link](</my uri>)
-```````````````````````````````` - - -```````````````````````````````` example -[link](foo -bar) -. -
[link](foo -bar)
-```````````````````````````````` - - -```````````````````````````````` example -[link]() -. -
[link]()
-```````````````````````````````` - -Parentheses inside the link destination may be escaped: - -```````````````````````````````` example -[link]($foo$) -. -
link
-```````````````````````````````` - -One level of balanced parentheses is allowed without escaping: - -```````````````````````````````` example -[link]((foo)and(bar)) -. -
link
-```````````````````````````````` - -However, if you have parentheses within parentheses, you need to escape -or use the `<...>` form: - -```````````````````````````````` example -[link](foo(and(bar))) -. -
[link](foo(and(bar)))
-```````````````````````````````` - - -```````````````````````````````` example -[link](foo(and$bar$)) -. -
link
-```````````````````````````````` - - -```````````````````````````````` example -[link]() -. -
link
-```````````````````````````````` - - -Parentheses and other symbols can also be escaped, as usual -in Markdown: - -```````````````````````````````` example -[link](foo\)\:) -. -
link
-```````````````````````````````` - - -A link can contain fragment identifiers and queries: - -```````````````````````````````` example -[link](#fragment) - -[link](http://example.com#fragment) - -[link](http://example.com?foo=3#frag) -. -
link
-
link
-
link
-```````````````````````````````` - - -Note that a backslash before a non-escapable character is -just a backslash: - -```````````````````````````````` example -[link](foo\bar) -. -
link
-```````````````````````````````` - - -URL-escaping should be left alone inside the destination, as all -URL-escaped characters are also valid URL characters. Entity and -numerical character references in the destination will be parsed -into the corresponding Unicode code points, as usual. These may -be optionally URL-escaped when written as HTML, but this spec -does not enforce any particular policy for rendering URLs in -HTML or other formats. Renderers may make different decisions -about how to escape or normalize URLs in the output. - -```````````````````````````````` example -[link](foo%20bä) -. -
link
-```````````````````````````````` - - -Note that, because titles can often be parsed as destinations, -if you try to omit the destination and keep the title, you'll -get unexpected results: - -```````````````````````````````` example -[link]("title") -. -
link
-```````````````````````````````` - - -Titles may be in single quotes, double quotes, or parentheses: - -```````````````````````````````` example -[link](/url "title") -[link](/url 'title') -[link](/url (title)) -. -
link -link -link
-```````````````````````````````` - - -Backslash escapes and entity and numeric character references -may be used in titles: - -```````````````````````````````` example -[link](/url "title \""") -. -
link
-```````````````````````````````` - - -Nested balanced quotes are not allowed without escaping: - -```````````````````````````````` example -[link](/url "title "and" title") -. -
[link](/url "title "and" title")
-```````````````````````````````` - - -But it is easy to work around this by using a different quote type: - -```````````````````````````````` example -[link](/url 'title "and" title') -. -
link
-```````````````````````````````` - - -(Note: `Markdown.pl` did allow double quotes inside a double-quoted -title, and its test suite included a test demonstrating this. -But it is hard to see a good rationale for the extra complexity this -brings, since there are already many ways---backslash escaping, -entity and numeric character references, or using a different -quote type for the enclosing title---to write titles containing -double quotes. `Markdown.pl`'s handling of titles has a number -of other strange features. For example, it allows single-quoted -titles in inline links, but not reference links. And, in -reference links but not inline links, it allows a title to begin -with `"` and end with `)`. `Markdown.pl` 1.0.1 even allows -titles with no closing quotation mark, though 1.0.2b8 does not. -It seems preferable to adopt a simple, rational rule that works -the same way in inline links and link reference definitions.) - -[Whitespace] is allowed around the destination and title: - -```````````````````````````````` example -[link]( /uri - "title" ) -. -
link
-```````````````````````````````` - - -But it is not allowed between the link text and the -following parenthesis: - -```````````````````````````````` example -[link] (/uri) -. -
[link] (/uri)
-```````````````````````````````` - - -The link text may contain balanced brackets, but not unbalanced ones, -unless they are escaped: - -```````````````````````````````` example -[link [foo [bar]]](/uri) -. -
link [foo [bar]]
-```````````````````````````````` - - -```````````````````````````````` example -[link] bar](/uri) -. -
[link] bar](/uri)
-```````````````````````````````` - - -```````````````````````````````` example -[link [bar](/uri) -. -
[link bar
-```````````````````````````````` - - -```````````````````````````````` example -[link \[bar](/uri) -. -
link [bar
-```````````````````````````````` - - -The link text may contain inline content: - -```````````````````````````````` example -[link *foo **bar** `#`*](/uri) -. -
link foo bar #
-```````````````````````````````` - - -```````````````````````````````` example -[![moon](moon.jpg)](/uri) -. -
-```````````````````````````````` - - -However, links may not contain other links, at any level of nesting. - -```````````````````````````````` example -[foo [bar](/uri)](/uri) -. -
[foo bar](/uri)
-```````````````````````````````` - - -```````````````````````````````` example -[foo *[bar [baz](/uri)](/uri)*](/uri) -. -
[foo [bar baz](/uri)](/uri)
-```````````````````````````````` - - -```````````````````````````````` example -![[[foo](uri1)](uri2)](uri3) -. -
-```````````````````````````````` - - -These cases illustrate the precedence of link text grouping over -emphasis grouping: - -```````````````````````````````` example -*[foo*](/uri) -. -
*foo*
-```````````````````````````````` - - -```````````````````````````````` example -[foo *bar](baz*) -. -
foo *bar
-```````````````````````````````` - - -Note that brackets that *aren't* part of links do not take -precedence: - -```````````````````````````````` example -*foo [bar* baz] -. -
foo [bar baz]
-```````````````````````````````` - - -These cases illustrate the precedence of HTML tags, code spans, -and autolinks over link grouping: - -```````````````````````````````` example -[foo -. -
[foo
-```````````````````````````````` - - -```````````````````````````````` example -[foo`](/uri)` -. -
[foo](/uri)
-```````````````````````````````` - - -```````````````````````````````` example -[foo -. -
[foohttp://example.com/?search=](uri)
-```````````````````````````````` - - -There are three kinds of [reference link](@)s: -[full](#full-reference-link), [collapsed](#collapsed-reference-link), -and [shortcut](#shortcut-reference-link). - -A [full reference link](@) -consists of a [link text] immediately followed by a [link label] -that [matches] a [link reference definition] elsewhere in the document. - -A [link label](@) begins with a left bracket (`[`) and ends -with the first right bracket (`]`) that is not backslash-escaped. -Between these brackets there must be at least one [non-whitespace character]. -Unescaped square bracket characters are not allowed in -[link labels]. A link label can have at most 999 -characters inside the square brackets. - -One label [matches](@) -another just in case their normalized forms are equal. To normalize a -label, perform the *Unicode case fold* and collapse consecutive internal -[whitespace] to a single space. If there are multiple -matching reference link definitions, the one that comes first in the -document is used. (It is desirable in such cases to emit a warning.) - -The contents of the first link label are parsed as inlines, which are -used as the link's text. The link's URI and title are provided by the -matching [link reference definition]. - -Here is a simple example: - -```````````````````````````````` example -[foo][bar] - -[bar]: /url "title" -. -
foo
-```````````````````````````````` - - -The rules for the [link text] are the same as with -[inline links]. Thus: - -The link text may contain balanced brackets, but not unbalanced ones, -unless they are escaped: - -```````````````````````````````` example -[link [foo [bar]]][ref] - -[ref]: /uri -. -
link [foo [bar]]
-```````````````````````````````` - - -```````````````````````````````` example -[link \[bar][ref] - -[ref]: /uri -. -
link [bar
-```````````````````````````````` - - -The link text may contain inline content: - -```````````````````````````````` example -[link *foo **bar** `#`*][ref] - -[ref]: /uri -. -
link foo bar #
-```````````````````````````````` - - -```````````````````````````````` example -[![moon](moon.jpg)][ref] - -[ref]: /uri -. -
-```````````````````````````````` - - -However, links may not contain other links, at any level of nesting. - -```````````````````````````````` example -[foo [bar](/uri)][ref] - -[ref]: /uri -. -
[foo bar]ref
-```````````````````````````````` - - -```````````````````````````````` example -[foo *bar [baz][ref]*][ref] - -[ref]: /uri -. -
[foo bar baz]ref
-```````````````````````````````` - - -(In the examples above, we have two [shortcut reference links] -instead of one [full reference link].) - -The following cases illustrate the precedence of link text grouping over -emphasis grouping: - -```````````````````````````````` example -*[foo*][ref] - -[ref]: /uri -. -
*foo*
-```````````````````````````````` - - -```````````````````````````````` example -[foo *bar][ref] - -[ref]: /uri -. -
foo *bar
-```````````````````````````````` - - -These cases illustrate the precedence of HTML tags, code spans, -and autolinks over link grouping: - -```````````````````````````````` example -[foo - -[ref]: /uri -. -
[foo
-```````````````````````````````` - - -```````````````````````````````` example -[foo`][ref]` - -[ref]: /uri -. -
[foo][ref]
-```````````````````````````````` - - -```````````````````````````````` example -[foo - -[ref]: /uri -. -
[foohttp://example.com/?search=][ref]
-```````````````````````````````` - - -Matching is case-insensitive: - -```````````````````````````````` example -[foo][BaR] - -[bar]: /url "title" -. -
foo
-```````````````````````````````` - - -Unicode case fold is used: - -```````````````````````````````` example -[Ð¢Ð¾Ð»Ð¿Ð¾Ð¹][Ð¢Ð¾Ð»Ð¿Ð¾Ð¹] is a Russian word. - -[Ð¢ÐÐÐÐÐ]: /url -. -
Ð¢Ð¾Ð»Ð¿Ð¾Ð¹ is a Russian word.
-```````````````````````````````` - - -Consecutive internal [whitespace] is treated as one space for -purposes of determining matching: - -```````````````````````````````` example -[Foo - bar]: /url - -[Baz][Foo bar] -. -
Baz
-```````````````````````````````` - - -No [whitespace] is allowed between the [link text] and the -[link label]: - -```````````````````````````````` example -[foo] [bar] - -[bar]: /url "title" -. -
[foo] bar
-```````````````````````````````` - - -```````````````````````````````` example -[foo] -[bar] - -[bar]: /url "title" -. -
[foo] -bar
-```````````````````````````````` - - -This is a departure from John Gruber's original Markdown syntax -description, which explicitly allows whitespace between the link -text and the link label. It brings reference links in line with -[inline links], which (according to both original Markdown and -this spec) cannot have whitespace after the link text. More -importantly, it prevents inadvertent capture of consecutive -[shortcut reference links]. If whitespace is allowed between the -link text and the link label, then in the following we will have -a single reference link, not two shortcut reference links, as -intended: - -``` markdown -[foo] -[bar] - -[foo]: /url1 -[bar]: /url2 -``` - -(Note that [shortcut reference links] were introduced by Gruber -himself in a beta version of `Markdown.pl`, but never included -in the official syntax description. Without shortcut reference -links, it is harmless to allow space between the link text and -link label; but once shortcut references are introduced, it is -too dangerous to allow this, as it frequently leads to -unintended results.) - -When there are multiple matching [link reference definitions], -the first is used: - -```````````````````````````````` example -[foo]: /url1 - -[foo]: /url2 - -[bar][foo] -. -
bar
-```````````````````````````````` - - -Note that matching is performed on normalized strings, not parsed -inline content. So the following does not match, even though the -labels define equivalent inline content: - -```````````````````````````````` example -[bar][foo\!] - -[foo!]: /url -. -
[bar][foo!]
-```````````````````````````````` - - -[Link labels] cannot contain brackets, unless they are -backslash-escaped: - -```````````````````````````````` example -[foo][ref[] - -[ref[]: /uri -. -
[foo][ref[]
-
[ref[]: /uri
-```````````````````````````````` - - -```````````````````````````````` example -[foo][ref[bar]] - -[ref[bar]]: /uri -. -
[foo][ref[bar]]
-
[ref[bar]]: /uri
-```````````````````````````````` - - -```````````````````````````````` example -[[[foo]]] - -[[[foo]]]: /url -. -
[[[foo]]]
-
[[[foo]]]: /url
-```````````````````````````````` - - -```````````````````````````````` example -[foo][ref\[] - -[ref\[]: /uri -. -
foo
-```````````````````````````````` - - -Note that in this example `]` is not backslash-escaped: - -```````````````````````````````` example -[bar\\]: /uri - -[bar\\] -. -
bar\
-```````````````````````````````` - - -A [link label] must contain at least one [non-whitespace character]: - -```````````````````````````````` example -[] - -[]: /uri -. -
[]
-
[]: /uri
-```````````````````````````````` - - -```````````````````````````````` example -[ - ] - -[ - ]: /uri -. -
[ -]
-
[ -]: /uri
-```````````````````````````````` - - -A [collapsed reference link](@) -consists of a [link label] that [matches] a -[link reference definition] elsewhere in the -document, followed by the string `[]`. -The contents of the first link label are parsed as inlines, -which are used as the link's text. The link's URI and title are -provided by the matching reference link definition. Thus, -`[foo][]` is equivalent to `[foo][foo]`. - -```````````````````````````````` example -[foo][] - -[foo]: /url "title" -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -[*foo* bar][] - -[*foo* bar]: /url "title" -. -
foo bar
-```````````````````````````````` - - -The link labels are case-insensitive: - -```````````````````````````````` example -[Foo][] - -[foo]: /url "title" -. -
Foo
-```````````````````````````````` - - - -As with full reference links, [whitespace] is not -allowed between the two sets of brackets: - -```````````````````````````````` example -[foo] -[] - -[foo]: /url "title" -. -
foo -[]
-```````````````````````````````` - - -A [shortcut reference link](@) -consists of a [link label] that [matches] a -[link reference definition] elsewhere in the -document and is not followed by `[]` or a link label. -The contents of the first link label are parsed as inlines, -which are used as the link's text. the link's URI and title -are provided by the matching link reference definition. -Thus, `[foo]` is equivalent to `[foo][]`. - -```````````````````````````````` example -[foo] - -[foo]: /url "title" -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -[*foo* bar] - -[*foo* bar]: /url "title" -. -
foo bar
-```````````````````````````````` - - -```````````````````````````````` example -[[*foo* bar]] - -[*foo* bar]: /url "title" -. -
[foo bar]
-```````````````````````````````` - - -```````````````````````````````` example -[[bar [foo] - -[foo]: /url -. -
[[bar foo
-```````````````````````````````` - - -The link labels are case-insensitive: - -```````````````````````````````` example -[Foo] - -[foo]: /url "title" -. -
Foo
-```````````````````````````````` - - -A space after the link text should be preserved: - -```````````````````````````````` example -[foo] bar - -[foo]: /url -. -
foo bar
-```````````````````````````````` - - -If you just want bracketed text, you can backslash-escape the -opening bracket to avoid links: - -```````````````````````````````` example -\[foo] - -[foo]: /url "title" -. -
[foo]
-```````````````````````````````` - - -Note that this is a link, because a link label ends with the first -following closing bracket: - -```````````````````````````````` example -[foo*]: /url - -*[foo*] -. -
*foo*
-```````````````````````````````` - - -Full references take precedence over shortcut references: - -```````````````````````````````` example -[foo][bar] - -[foo]: /url1 -[bar]: /url2 -. -
foo
-```````````````````````````````` - - -In the following case `[bar][baz]` is parsed as a reference, -`[foo]` as normal text: - -```````````````````````````````` example -[foo][bar][baz] - -[baz]: /url -. -
[foo]bar
-```````````````````````````````` - - -Here, though, `[foo][bar]` is parsed as a reference, since -`[bar]` is defined: - -```````````````````````````````` example -[foo][bar][baz] - -[baz]: /url1 -[bar]: /url2 -. -
foo baz
-```````````````````````````````` - - -Here `[foo]` is not parsed as a shortcut reference, because it -is followed by a link label (even though `[bar]` is not defined): - -```````````````````````````````` example -[foo][bar][baz] - -[baz]: /url1 -[foo]: /url2 -. -
[foo]bar
-```````````````````````````````` - - - -## Images - -Syntax for images is like the syntax for links, with one -difference. Instead of [link text], we have an -[image description](@). The rules for this are the -same as for [link text], except that (a) an -image description starts with `![` rather than `[`, and -(b) an image description may contain links. -An image description has inline elements -as its contents. When an image is rendered to HTML, -this is standardly used as the image's `alt` attribute. - -```````````````````````````````` example -![foo](/url "title") -. -
-```````````````````````````````` - - -```````````````````````````````` example -![foo *bar*] - -[foo *bar*]: train.jpg "train & tracks" -. -
-```````````````````````````````` - - -```````````````````````````````` example -![foo ![bar](/url)](/url2) -. -
-```````````````````````````````` - - -```````````````````````````````` example -![foo [bar](/url)](/url2) -. -
-```````````````````````````````` - - -Though this spec is concerned with parsing, not rendering, it is -recommended that in rendering to HTML, only the plain string content -of the [image description] be used. Note that in -the above example, the alt attribute's value is `foo bar`, not `foo -[bar](/url)` or `foo bar`. Only the plain string -content is rendered, without formatting. - -```````````````````````````````` example -![foo *bar*][] - -[foo *bar*]: train.jpg "train & tracks" -. -
-```````````````````````````````` - - -```````````````````````````````` example -![foo *bar*][foobar] - -[FOOBAR]: train.jpg "train & tracks" -. -
-```````````````````````````````` - - -```````````````````````````````` example -![foo](train.jpg) -. -
-```````````````````````````````` - - -```````````````````````````````` example -My ![foo bar](/path/to/train.jpg "title" ) -. -
My
-```````````````````````````````` - - -```````````````````````````````` example -![foo]() -. -
-```````````````````````````````` - - -```````````````````````````````` example -![](/url) -. -
-```````````````````````````````` - - -Reference-style: - -```````````````````````````````` example -![foo][bar] - -[bar]: /url -. -
-```````````````````````````````` - - -```````````````````````````````` example -![foo][bar] - -[BAR]: /url -. -
-```````````````````````````````` - - -Collapsed: - -```````````````````````````````` example -![foo][] - -[foo]: /url "title" -. -
-```````````````````````````````` - - -```````````````````````````````` example -![*foo* bar][] - -[*foo* bar]: /url "title" -. -
-```````````````````````````````` - - -The labels are case-insensitive: - -```````````````````````````````` example -![Foo][] - -[foo]: /url "title" -. -
-```````````````````````````````` - - -As with reference links, [whitespace] is not allowed -between the two sets of brackets: - -```````````````````````````````` example -![foo] -[] - -[foo]: /url "title" -. -
-[]
-```````````````````````````````` - - -Shortcut: - -```````````````````````````````` example -![foo] - -[foo]: /url "title" -. -
-```````````````````````````````` - - -```````````````````````````````` example -![*foo* bar] - -[*foo* bar]: /url "title" -. -
-```````````````````````````````` - - -Note that link labels cannot contain unescaped brackets: - -```````````````````````````````` example -![[foo]] - -[[foo]]: /url "title" -. -
![[foo]]
-
[[foo]]: /url "title"
-```````````````````````````````` - - -The link labels are case-insensitive: - -```````````````````````````````` example -![Foo] - -[foo]: /url "title" -. -
-```````````````````````````````` - - -If you just want bracketed text, you can backslash-escape the -opening `!` and `[`: - -```````````````````````````````` example -\!\[foo] - -[foo]: /url "title" -. -
![foo]
-```````````````````````````````` - - -If you want a link after a literal `!`, backslash-escape the -`!`: - -```````````````````````````````` example -\![foo] - -[foo]: /url "title" -. -
!foo
-```````````````````````````````` - - -## Autolinks - -[Autolink](@)s are absolute URIs and email addresses inside -`<` and `>`. They are parsed as links, with the URL or email address -as the link label. - -A [URI autolink](@) consists of `<`, followed by an -[absolute URI] not containing `<`, followed by `>`. It is parsed as -a link to the URI, with the URI as the link's label. - -An [absolute URI](@), -for these purposes, consists of a [scheme] followed by a colon (`:`) -followed by zero or more characters other than ASCII -[whitespace] and control characters, `<`, and `>`. If -the URI includes these characters, they must be percent-encoded -(e.g. `%20` for a space). - -For purposes of this spec, a [scheme](@) is any sequence -of 2--32 characters beginning with an ASCII letter and followed -by any combination of ASCII letters, digits, or the symbols plus -("+"), period ("."), or hyphen ("-"). - -Here are some valid autolinks: - -```````````````````````````````` example - -. -
http://foo.bar.baz
-```````````````````````````````` - - -```````````````````````````````` example - -. -
http://foo.bar.baz/test?q=hello&id=22&boolean
-```````````````````````````````` - - -```````````````````````````````` example - -. -
irc://foo.bar:2233/baz
-```````````````````````````````` - - -Uppercase is also fine: - -```````````````````````````````` example - -. -
MAILTO:FOO@BAR.BAZ
-```````````````````````````````` - - -Note that many strings that count as [absolute URIs] for -purposes of this spec are not valid URIs, because their -schemes are not registered or because of other problems -with their syntax: - -```````````````````````````````` example - -. -
a+b+c:d
-```````````````````````````````` - - -```````````````````````````````` example - -. -
made-up-scheme://foo,bar
-```````````````````````````````` - - -```````````````````````````````` example - -. -
http://../
-```````````````````````````````` - - -```````````````````````````````` example - -. -
localhost:5001/foo
-```````````````````````````````` - - -Spaces are not allowed in autolinks: - -```````````````````````````````` example - -. -
<http://foo.bar/baz bim>
-```````````````````````````````` - - -Backslash-escapes do not work inside autolinks: - -```````````````````````````````` example - -. -
http://example.com/\[\
-```````````````````````````````` - - -An [email autolink](@) -consists of `<`, followed by an [email address], -followed by `>`. The link's label is the email address, -and the URL is `mailto:` followed by the email address. - -An [email address](@), -for these purposes, is anything that matches -the [non-normative regex from the HTML5 -spec](https://html.spec.whatwg.org/multipage/forms.html#e-mail-state-(type=email)): - - /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])? - (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/ - -Examples of email autolinks: - -```````````````````````````````` example - -. -
foo@bar.example.com
-```````````````````````````````` - - -```````````````````````````````` example - -. -
foo+special@Bar.baz-bar0.com
-```````````````````````````````` - - -Backslash-escapes do not work inside email autolinks: - -```````````````````````````````` example - -. -
<foo+@bar.example.com>
-```````````````````````````````` - - -These are not autolinks: - -```````````````````````````````` example -<> -. -
<>
-```````````````````````````````` - - -```````````````````````````````` example -< http://foo.bar > -. -
< http://foo.bar >
-```````````````````````````````` - - -```````````````````````````````` example - -. -
<m:abc>
-```````````````````````````````` - - -```````````````````````````````` example - -. -
<foo.bar.baz>
-```````````````````````````````` - - -```````````````````````````````` example -http://example.com -. -
http://example.com
-```````````````````````````````` - - -```````````````````````````````` example -foo@bar.example.com -. -
foo@bar.example.com
-```````````````````````````````` - - -## Raw HTML - -Text between `<` and `>` that looks like an HTML tag is parsed as a -raw HTML tag and will be rendered in HTML without escaping. -Tag and attribute names are not limited to current HTML tags, -so custom tags (and even, say, DocBook tags) may be used. - -Here is the grammar for tags: - -A [tag name](@) consists of an ASCII letter -followed by zero or more ASCII letters, digits, or -hyphens (`-`). - -An [attribute](@) consists of [whitespace], -an [attribute name], and an optional -[attribute value specification]. - -An [attribute name](@) -consists of an ASCII letter, `_`, or `:`, followed by zero or more ASCII -letters, digits, `_`, `.`, `:`, or `-`. (Note: This is the XML -specification restricted to ASCII. HTML5 is laxer.) - -An [attribute value specification](@) -consists of optional [whitespace], -a `=` character, optional [whitespace], and an [attribute -value]. - -An [attribute value](@) -consists of an [unquoted attribute value], -a [single-quoted attribute value], or a [double-quoted attribute value]. - -An [unquoted attribute value](@) -is a nonempty string of characters not -including spaces, `"`, `'`, `=`, `<`, `>`, or `` ` ``. - -A [single-quoted attribute value](@) -consists of `'`, zero or more -characters not including `'`, and a final `'`. - -A [double-quoted attribute value](@) -consists of `"`, zero or more -characters not including `"`, and a final `"`. - -An [open tag](@) consists of a `<` character, a [tag name], -zero or more [attributes], optional [whitespace], an optional `/` -character, and a `>` character. - -A [closing tag](@) consists of the string ``. - -An [HTML comment](@) consists of ``, -where *text* does not start with `>` or `->`, does not end with `-`, -and does not contain `--`. (See the -[HTML5 spec](http://www.w3.org/TR/html5/syntax.html#comments).) - -A [processing instruction](@) -consists of the string ``, and the string -`?>`. - -A [declaration](@) consists of the -string ``, and the character `>`. - -A [CDATA section](@) consists of -the string ``, and the string `]]>`. - -An [HTML tag](@) consists of an [open tag], a [closing tag], -an [HTML comment], a [processing instruction], a [declaration], -or a [CDATA section]. - -Here are some simple open tags: - -```````````````````````````````` example - -. -
-```````````````````````````````` - - -Empty elements: - -```````````````````````````````` example - -. -
-```````````````````````````````` - - -[Whitespace] is allowed: - -```````````````````````````````` example - -. -
-```````````````````````````````` - - -With attributes: - -```````````````````````````````` example - -. -
-```````````````````````````````` - - -Custom tag names can be used: - -```````````````````````````````` example -Foo -. -
Foo
-```````````````````````````````` - - -Illegal tag names, not parsed as HTML: - -```````````````````````````````` example -<33> <__> -. -
<33> <__>
-```````````````````````````````` - - -Illegal attribute names: - -```````````````````````````````` example - -. -
<a h*#ref="hi">
-```````````````````````````````` - - -Illegal attribute values: - -```````````````````````````````` example - -. -
</a href="foo">
-```````````````````````````````` - - -Comments: - -```````````````````````````````` example -foo -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -foo -. -
foo 
-```````````````````````````````` - - -Not comments: - -```````````````````````````````` example -foo foo --> - -foo -. -
foo 
-
foo 
-```````````````````````````````` - - -Processing instructions: - -```````````````````````````````` example -foo -. -
foo
-```````````````````````````````` - - -Declarations: - -```````````````````````````````` example -foo -. -
foo
-```````````````````````````````` - - -CDATA sections: - -```````````````````````````````` example -foo &<]]> -. -
foo &<]]>
-```````````````````````````````` - - -Entity and numeric character references are preserved in HTML -attributes: - -```````````````````````````````` example -foo -. -
foo
-```````````````````````````````` - - -Backslash escapes do not work in HTML attributes: - -```````````````````````````````` example -foo -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example - -. -
<a href=""">
-```````````````````````````````` - - -## Hard line breaks - -A line break (not in a code span or HTML tag) that is preceded -by two or more spaces and does not occur at the end of a block -is parsed as a [hard line break](@) (rendered -in HTML as a `
` tag): - -```````````````````````````````` example -foo -baz -. -
foo
-baz
-```````````````````````````````` - - -For a more visible alternative, a backslash before the -[line ending] may be used instead of two spaces: - -```````````````````````````````` example -foo\ -baz -. -
foo
-baz
-```````````````````````````````` - - -More than two spaces can be used: - -```````````````````````````````` example -foo -baz -. -
foo
-baz
-```````````````````````````````` - - -Leading spaces at the beginning of the next line are ignored: - -```````````````````````````````` example -foo - bar -. -
foo
-bar
-```````````````````````````````` - - -```````````````````````````````` example -foo\ - bar -. -
foo
-bar
-```````````````````````````````` - - -Line breaks can occur inside emphasis, links, and other constructs -that allow inline content: - -```````````````````````````````` example -*foo -bar* -. -
foo
-bar
-```````````````````````````````` - - -```````````````````````````````` example -*foo\ -bar* -. -
foo
-bar
-```````````````````````````````` - - -Line breaks do not occur inside code spans - -```````````````````````````````` example -`code -span` -. -
code span
-```````````````````````````````` - - -```````````````````````````````` example -`code\ -span` -. -
code\ span
-```````````````````````````````` - - -or HTML tags: - -```````````````````````````````` example - -. -
-```````````````````````````````` - - -```````````````````````````````` example - -. -
-```````````````````````````````` - - -Hard line breaks are for separating inline content within a block. -Neither syntax for hard line breaks works at the end of a paragraph or -other block element: - -```````````````````````````````` example -foo\ -. -
foo\
-```````````````````````````````` - - -```````````````````````````````` example -foo -. -
foo
-```````````````````````````````` - - -```````````````````````````````` example -### foo\ -. -
foo\
-```````````````````````````````` - - -```````````````````````````````` example -### foo -. -
foo
-```````````````````````````````` - - -## Soft line breaks - -A regular line break (not in a code span or HTML tag) that is not -preceded by two or more spaces or a backslash is parsed as a -softbreak. (A softbreak may be rendered in HTML either as a -[line ending] or as a space. The result will be the same in -browsers. In the examples here, a [line ending] will be used.) - -```````````````````````````````` example -foo -baz -. -
foo -baz
-```````````````````````````````` - - -Spaces at the end of the line and beginning of the next line are -removed: - -```````````````````````````````` example -foo - baz -. -
foo -baz
-```````````````````````````````` - - -A conforming parser may render a soft line break in HTML either as a -line break or as a space. - -A renderer may also provide an option to render soft line breaks -as hard line breaks. - -## Textual content - -Any characters not given an interpretation by the above rules will -be parsed as plain textual content. - -```````````````````````````````` example -hello $.;'there -. -
hello $.;'there
-```````````````````````````````` - - -```````````````````````````````` example -Foo ÏÏá¿Î½ -. -
Foo ÏÏá¿Î½
-```````````````````````````````` - - -Internal spaces are preserved verbatim: - -```````````````````````````````` example -Multiple spaces -. -
Multiple spaces
-```````````````````````````````` - - - - -# Appendix: A parsing strategy - -In this appendix we describe some features of the parsing strategy -used in the CommonMark reference implementations. - -## Overview - -Parsing has two phases: - -1. In the first phase, lines of input are consumed and the block -structure of the document---its division into paragraphs, block quotes, -list items, and so on---is constructed. Text is assigned to these -blocks but not parsed. Link reference definitions are parsed and a -map of links is constructed. - -2. In the second phase, the raw text contents of paragraphs and headings -are parsed into sequences of Markdown inline elements (strings, -code spans, links, emphasis, and so on), using the map of link -references constructed in phase 1. - -At each point in processing, the document is represented as a tree of -**blocks**. The root of the tree is a `document` block. The `document` -may have any number of other blocks as **children**. These children -may, in turn, have other blocks as children. The last child of a block -is normally considered **open**, meaning that subsequent lines of input -can alter its contents. (Blocks that are not open are **closed**.) -Here, for example, is a possible document tree, with the open blocks -marked by arrows: - -``` tree --> document - -> block_quote - paragraph - "Lorem ipsum dolor\nsit amet." - -> list (type=bullet tight=true bullet_char=-) - list_item - paragraph - "Qui *quodsi iracundia*" - -> list_item - -> paragraph - "aliquando id" -``` - -## Phase 1: block structure - -Each line that is processed has an effect on this tree. The line is -analyzed and, depending on its contents, the document may be altered -in one or more of the following ways: - -1. One or more open blocks may be closed. -2. One or more new blocks may be created as children of the - last open block. -3. Text may be added to the last (deepest) open block remaining - on the tree. - -Once a line has been incorporated into the tree in this way, -it can be discarded, so input can be read in a stream. - -For each line, we follow this procedure: - -1. First we iterate through the open blocks, starting with the -root document, and descending through last children down to the last -open block. Each block imposes a condition that the line must satisfy -if the block is to remain open. For example, a block quote requires a -`>` character. A paragraph requires a non-blank line. -In this phase we may match all or just some of the open -blocks. But we cannot close unmatched blocks yet, because we may have a -[lazy continuation line]. - -2. Next, after consuming the continuation markers for existing -blocks, we look for new block starts (e.g. `>` for a block quote. -If we encounter a new block start, we close any blocks unmatched -in step 1 before creating the new block as a child of the last -matched block. - -3. Finally, we look at the remainder of the line (after block -markers like `>`, list markers, and indentation have been consumed). -This is text that can be incorporated into the last open -block (a paragraph, code block, heading, or raw HTML). - -Setext headings are formed when we see a line of a paragraph -that is a [setext heading underline]. - -Reference link definitions are detected when a paragraph is closed; -the accumulated text lines are parsed to see if they begin with -one or more reference link definitions. Any remainder becomes a -normal paragraph. - -We can see how this works by considering how the tree above is -generated by four lines of Markdown: - -``` markdown -> Lorem ipsum dolor -sit amet. -> - Qui *quodsi iracundia* -> - aliquando id -``` - -At the outset, our document model is just - -``` tree --> document -``` - -The first line of our text, - -``` markdown -> Lorem ipsum dolor -``` - -causes a `block_quote` block to be created as a child of our -open `document` block, and a `paragraph` block as a child of -the `block_quote`. Then the text is added to the last open -block, the `paragraph`: - -``` tree --> document - -> block_quote - -> paragraph - "Lorem ipsum dolor" -``` - -The next line, - -``` markdown -sit amet. -``` - -is a "lazy continuation" of the open `paragraph`, so it gets added -to the paragraph's text: - -``` tree --> document - -> block_quote - -> paragraph - "Lorem ipsum dolor\nsit amet." -``` - -The third line, - -``` markdown -> - Qui *quodsi iracundia* -``` - -causes the `paragraph` block to be closed, and a new `list` block -opened as a child of the `block_quote`. A `list_item` is also -added as a child of the `list`, and a `paragraph` as a child of -the `list_item`. The text is then added to the new `paragraph`: - -``` tree --> document - -> block_quote - paragraph - "Lorem ipsum dolor\nsit amet." - -> list (type=bullet tight=true bullet_char=-) - -> list_item - -> paragraph - "Qui *quodsi iracundia*" -``` - -The fourth line, - -``` markdown -> - aliquando id -``` - -causes the `list_item` (and its child the `paragraph`) to be closed, -and a new `list_item` opened up as child of the `list`. A `paragraph` -is added as a child of the new `list_item`, to contain the text. -We thus obtain the final tree: - -``` tree --> document - -> block_quote - paragraph - "Lorem ipsum dolor\nsit amet." - -> list (type=bullet tight=true bullet_char=-) - list_item - paragraph - "Qui *quodsi iracundia*" - -> list_item - -> paragraph - "aliquando id" -``` - -## Phase 2: inline structure - -Once all of the input has been parsed, all open blocks are closed. - -We then "walk the tree," visiting every node, and parse raw -string contents of paragraphs and headings as inlines. At this -point we have seen all the link reference definitions, so we can -resolve reference links as we go. - -``` tree -document - block_quote - paragraph - str "Lorem ipsum dolor" - softbreak - str "sit amet." - list (type=bullet tight=true bullet_char=-) - list_item - paragraph - str "Qui " - emph - str "quodsi iracundia" - list_item - paragraph - str "aliquando id" -``` - -Notice how the [line ending] in the first paragraph has -been parsed as a `softbreak`, and the asterisks in the first list item -have become an `emph`. - -### An algorithm for parsing nested emphasis and links - -By far the trickiest part of inline parsing is handling emphasis, -strong emphasis, links, and images. This is done using the following -algorithm. - -When we're parsing inlines and we hit either - -- a run of `*` or `_` characters, or -- a `[` or `![` - -we insert a text node with these symbols as its literal content, and we -add a pointer to this text node to the [delimiter stack](@). - -The [delimiter stack] is a doubly linked list. Each -element contains a pointer to a text node, plus information about - -- the type of delimiter (`[`, `![`, `*`, `_`) -- the number of delimiters, -- whether the delimiter is "active" (all are active to start), and -- whether the delimiter is a potential opener, a potential closer, - or both (which depends on what sort of characters precede - and follow the delimiters). - -When we hit a `]` character, we call the *look for link or image* -procedure (see below). - -When we hit the end of the input, we call the *process emphasis* -procedure (see below), with `stack_bottom` = NULL. - -#### *look for link or image* - -Starting at the top of the delimiter stack, we look backwards -through the stack for an opening `[` or `![` delimiter. - -- If we don't find one, we return a literal text node `]`. - -- If we do find one, but it's not *active*, we remove the inactive - delimiter from the stack, and return a literal text node `]`. - -- If we find one and it's active, then we parse ahead to see if - we have an inline link/image, reference link/image, compact reference - link/image, or shortcut reference link/image. - - + If we don't, then we remove the opening delimiter from the - delimiter stack and return a literal text node `]`. - - + If we do, then - - * We return a link or image node whose children are the inlines - after the text node pointed to by the opening delimiter. - - * We run *process emphasis* on these inlines, with the `[` opener - as `stack_bottom`. - - * We remove the opening delimiter. - - * If we have a link (and not an image), we also set all - `[` delimiters before the opening delimiter to *inactive*. (This - will prevent us from getting links within links.) - -#### *process emphasis* - -Parameter `stack_bottom` sets a lower bound to how far we -descend in the [delimiter stack]. If it is NULL, we can -go all the way to the bottom. Otherwise, we stop before -visiting `stack_bottom`. - -Let `current_position` point to the element on the [delimiter stack] -just above `stack_bottom` (or the first element if `stack_bottom` -is NULL). - -We keep track of the `openers_bottom` for each delimiter -type (`*`, `_`). Initialize this to `stack_bottom`. - -Then we repeat the following until we run out of potential -closers: - -- Move `current_position` forward in the delimiter stack (if needed) - until we find the first potential closer with delimiter `*` or `_`. - (This will be the potential closer closest - to the beginning of the input -- the first one in parse order.) - -- Now, look back in the stack (staying above `stack_bottom` and - the `openers_bottom` for this delimiter type) for the - first matching potential opener ("matching" means same delimiter). - -- If one is found: - - + Figure out whether we have emphasis or strong emphasis: - if both closer and opener spans have length >= 2, we have - strong, otherwise regular. - - + Insert an emph or strong emph node accordingly, after - the text node corresponding to the opener. - - + Remove any delimiters between the opener and closer from - the delimiter stack. - - + Remove 1 (for regular emph) or 2 (for strong emph) delimiters - from the opening and closing text nodes. If they become empty - as a result, remove them and remove the corresponding element - of the delimiter stack. If the closing node is removed, reset - `current_position` to the next element in the stack. - -- If none in found: - - + Set `openers_bottom` to the element before `current_position`. - (We know that there are no openers for this kind of closer up to and - including this point, so this puts a lower bound on future searches.) - - + If the closer at `current_position` is not a potential opener, - remove it from the delimiter stack (since we know it can't - be a closer either). - - + Advance `current_position` to the next element in the stack. - -After we're done, we remove all delimiters above `stack_bottom` from the -delimiter stack. - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/performance/SumOfInverses.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/performance/SumOfInverses.scl deleted file mode 100644 index a3f940760..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/performance/SumOfInverses.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -main :: Double -> Double -main m = loop 1 0 - where - loop x cur = if x > m - then cur - else loop (x+1) (cur + 1 / x) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/performance/SumOfInverses2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/performance/SumOfInverses2.scl deleted file mode 100644 index 7745029bf..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/performance/SumOfInverses2.scl +++ /dev/null @@ -1,4 +0,0 @@ -import "Prelude" - -main :: Integer -> Double -main m = sum [1/(fromInteger x) | x <- [1..m]] diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/AmbiguousType.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/AmbiguousType.scl deleted file mode 100644 index f4871d7d5..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/AmbiguousType.scl +++ /dev/null @@ -1,12 +0,0 @@ - - -class Show a where - show :: a -> String - -class Read a where - read :: String -> a - -combine x = show (read x) --- -9:13-9:17: Constrain Show a contains free variables not mentioned in the type of the value. -9:19-9:23: Constrain Read a contains free variables not mentioned in the type of the value. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ApplicationOfNunfunction.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ApplicationOfNunfunction.scl deleted file mode 100644 index 13167bee6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ApplicationOfNunfunction.scl +++ /dev/null @@ -1,3 +0,0 @@ -main = "Hello" "world!" --- -1:8-1:24: Application of non-function. diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Arity1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Arity1.scl deleted file mode 100644 index fa48e47c1..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Arity1.scl +++ /dev/null @@ -1,9 +0,0 @@ - -data Foo a = Foo a - -f :: Foo a -> a -f = \Foo a -> a - -main = "Not to be executed" --- -5:6-5:11: Arity is 1 but 2 patterns have been given. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/AsPattern.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/AsPattern.scl deleted file mode 100644 index 0e3337099..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/AsPattern.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "JavaBuiltin" as Java - -sort p@(a,b) | Java.icmpgt a b = (b,a) - | True = p - -main = sort (sort (2 :: Integer,1 :: Integer)) --- -(1,2) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigContext.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigContext.scl deleted file mode 100644 index fc70cc23c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigContext.scl +++ /dev/null @@ -1,28 +0,0 @@ -import "Prelude" - -main = do - a1 = 1 - a2 = 1 - a3 = 1 - a4 = 1 - a5 = 1 - a6 = 1 - a7 = 1 - a8 = 1 - a9 = 1 - a10 = 1 - a11 = 1 - a12 = 1 - a13 = 1 - a14 = 1 - a15 = 1 - a16 = 1 - a17 = 1 - a18 = 1 - a19 = 1 - a20 = 1 - f x = x + a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10 + - a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20 - f 10 --- -30 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigFunction.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigFunction.scl deleted file mode 100644 index 102bc1d7e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigFunction.scl +++ /dev/null @@ -1,7 +0,0 @@ -import "Prelude" - -f a b c d e f g h = a + b + c + d + e + f + g + h - -main = (id f) 1 2 3 4 5 6 7 8 --- -36 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigInstances.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigInstances.scl deleted file mode 100644 index c64b1b703..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BigInstances.scl +++ /dev/null @@ -1,16 +0,0 @@ - -class Foo a where - foo :: a - -class (Foo a) => Bar a where - bar :: a - -instance Bar Double where - foo x = x - bar x = x - -main = foo 3.0 + bar 4.0 --- -7.0 - - \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BinaryOperators1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BinaryOperators1.scl deleted file mode 100644 index 86263c9aa..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BinaryOperators1.scl +++ /dev/null @@ -1,25 +0,0 @@ -import "Prelude" - -data E = E String - -instance Additive E where - zero = E "0" - E a + E b = E ("(" + a + "+" + b + ")") - -instance Ring E where - one = E "1" - neg (E a) = E ("(-" + a + ")") - E a - E b = E ("(" + a + "-" + b + ")") - E a * E b = E ("(" + a + "*" + b + ")") - fromInteger x = E (show x) - -eToString (E a) = a - -a = E "a" -b = E "b" -c = E "c" -d = E "d" - -main = eToString (-a + b + (-c*d)) --- -(((-a)+b)+(-(c*d))) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BlankExpression.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BlankExpression.scl deleted file mode 100644 index f31e144e8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BlankExpression.scl +++ /dev/null @@ -1,3 +0,0 @@ -main = _ --- -??? \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BooleanId.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BooleanId.scl deleted file mode 100644 index 2044c1c9b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/BooleanId.scl +++ /dev/null @@ -1,12 +0,0 @@ -@private -@inline -not True = False -not False = True - -@private -@inline -id x = not (not x) - -main = id True --- -true \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Bug4450.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Bug4450.scl deleted file mode 100644 index 54e65c2e9..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Bug4450.scl +++ /dev/null @@ -1,15 +0,0 @@ -import "Prelude" - -csvWrite :: String -> [[String]] -> () -csvWrite fname rows = () - -/// Like writeEntries but with a transformer function also for values. -/// kfun key + vfun value should have the length of header. -writeEntries' :: (k -> [String]) -> (v -> [String]) - -> String -> [String] -> [(k, v)] -> () -writeEntries' kfun vfun fname header rows = - csvWrite fname $ [header] + [kfun k + vfun v | (k, v) <- rows] - -main = "OK" --- -OK \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Character1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Character1.scl deleted file mode 100644 index b08d2aef3..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Character1.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = subChar '6' '0' --- -6 diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingClass.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingClass.scl deleted file mode 100644 index dee1e8d43..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingClass.scl +++ /dev/null @@ -1,8 +0,0 @@ - -class A a where - foo :: a - -class A a where - bar :: a --- -5:1-6:13: Class A has already been defined in this module. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingData.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingData.scl deleted file mode 100644 index 60245db07..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingData.scl +++ /dev/null @@ -1,5 +0,0 @@ - -data A = A -data A = B --- -3:1-3:11: Type A has already been defined in this module. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingInstance.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingInstance.scl deleted file mode 100644 index 72178db3a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingInstance.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 6 (+) - -class Additive a where - (+) :: a -> a -> a - -instance Additive Double where - (+) = Java.dadd - -instance Additive Double where - (+) = Java.dadd --- -11:1-12:20: Duplicate definition of the instance Additive Double. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingValueDefinition.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingValueDefinition.scl deleted file mode 100644 index f7ec72a43..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingValueDefinition.scl +++ /dev/null @@ -1,5 +0,0 @@ -a = 1 -a = 2 -main = "Should not be executed." --- -??? \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingValueType.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingValueType.scl deleted file mode 100644 index d248d20f2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ClashingValueType.scl +++ /dev/null @@ -1,6 +0,0 @@ - -id :: Integer -> Integer -id :: Double -> Double -id x = x --- -3:1-3:23: Type of id has already been declared in this module. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Collaz.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Collaz.scl deleted file mode 100644 index 2e4552d0d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Collaz.scl +++ /dev/null @@ -1,16 +0,0 @@ -import "Prelude" - -f x = if x `mod` 2 == 0 - then x `div` 2 - else 3*x + 1 -fd x = unfoldr (\x -> do - r = f x - if x == 1 - then Nothing - else Just (x,r) - ) x - -//main :: [Integer] -main = fd 7 --- -[7, 22, 11, 34, 17, 52, 26, 13, 40, 20, 10, 5, 16, 8, 4, 2] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Compose.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Compose.scl deleted file mode 100644 index fad8b9b67..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Compose.scl +++ /dev/null @@ -1,20 +0,0 @@ -import "JavaBuiltin" as Java - -(+) = Java.iadd -(-) = Java.isub -(*) = Java.imul - -data List a = Nil | Cons a (List a) - -compose :: List (a -> a) -> a -> a -compose Nil x = x -compose (Cons h t) x = compose t (h x) - -succ x = x + 1 -prec x = x - 1 -double x = x * 2 - -f = compose (Cons succ (Cons double (Cons prec Nil))) -main = f 13 --- -27 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Composition.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Composition.scl deleted file mode 100644 index 80b1c06a4..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Composition.scl +++ /dev/null @@ -1,17 +0,0 @@ -infixr 9 (.) - -@private -@inline -(f . g) = \x -> f (g x) - -@private -@inline -flip (x,y) = (y,x) - -@private -@inline -flip4 = flip . flip . flip . flip - -main = flip4 ("a", "b") --- -(a,b) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ConjunctionMacro.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ConjunctionMacro.scl deleted file mode 100644 index 99188f8bb..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ConjunctionMacro.scl +++ /dev/null @@ -1,6 +0,0 @@ -(&&) :: Boolean -> ( Boolean) -> Boolean -a && b = if a then b else False - -main = False && fail "Should not be evaluated!" --- -false \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Constant.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Constant.scl deleted file mode 100644 index 7ea0367bd..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Constant.scl +++ /dev/null @@ -1,6 +0,0 @@ - -a = 14 :: Integer - -main = a --- -14 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ConstructorNameClash.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ConstructorNameClash.scl deleted file mode 100644 index 52826a538..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ConstructorNameClash.scl +++ /dev/null @@ -1,7 +0,0 @@ - -data Vec2 = Vec2 Double Double -data Vec3 = Vec2 Double Double Double - -main = "Not to be executed." --- -3:13-3:38: Value Vec2 is already defined. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DefaultMethods1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DefaultMethods1.scl deleted file mode 100644 index 142dd30a5..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DefaultMethods1.scl +++ /dev/null @@ -1,13 +0,0 @@ -import "JavaBuiltin" as Java - -class Ord a where - (<) :: a -> a -> Boolean - min :: a -> a -> a - min x y = if x < y then x else y - -instance Ord Integer where - (<) = Java.icmplt - -main = min (43 :: Integer) (69 :: Integer) --- -43 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Deriving3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Deriving3.scl deleted file mode 100644 index ec2f5b7bd..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Deriving3.scl +++ /dev/null @@ -1,29 +0,0 @@ -import "Prelude" - -a,b,c,d :: Either Boolean Boolean -a = Left False -b = Left True -c = Right False -d = Right True - -main = a == a - && a < b - && a < c - && a < d - - && b > a - && b == b - && b < c - && b < d - - && c > a - && c > b - && c == c - && c < d - - && d > a - && d > b - && d > c - && d == d --- -true \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Deriving4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Deriving4.scl deleted file mode 100644 index 03ea0d609..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Deriving4.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -data Foo = Foo Integer Long Double Float - -deriving instance Show Foo - -main = show (Foo (-1) (-1) (-1) (-1)) --- -Foo (-1) (-1) (-1.0) (-1.0) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DifferentBranchTypes.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DifferentBranchTypes.scl deleted file mode 100644 index 2a0925fe9..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DifferentBranchTypes.scl +++ /dev/null @@ -1,19 +0,0 @@ -import "Prelude" - -foo n = n - where - if n > 0 - then 1 - else "asd" - -bar n = n - where - do - c = n+1 - if c > 0 - then 1 - else "asd" - -main = foo 3 + bar 3 --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Div.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Div.scl deleted file mode 100644 index 4a8e1ca24..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Div.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = 7 `div` 3 --- -2 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DoubleConversion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DoubleConversion.scl deleted file mode 100644 index 31e95edb3..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DoubleConversion.scl +++ /dev/null @@ -1,17 +0,0 @@ -import "Prelude" - -f :: Float -f = 1.0 - -d :: Double -d = 1.0 - -d2f :: Float -d2f = fromDouble d - -f2d :: Double -f2d = toDouble f - -main = show (d+f2d, f+d2f) --- -(2.0, 2.0) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DoubleEffect.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DoubleEffect.scl deleted file mode 100644 index b0615106f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/DoubleEffect.scl +++ /dev/null @@ -1,8 +0,0 @@ -app :: (Integer -> Integer) -> ((Integer -> Integer) -> Integer) -app f = do - a = f 1 - \g -> g a - -main = app (\x -> x) (\x -> x) --- -1 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects1.scl deleted file mode 100644 index 11a3303d4..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects1.scl +++ /dev/null @@ -1,18 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "java.util.regex.Pattern" where - data Pattern - - compile :: String -> Pattern - matcher :: Pattern -> String -> Matcher - -importJava "java.util.regex.Matcher" where - data Matcher - - matches :: Matcher -> Boolean - -doMatch pattern text = matches (matcher pattern text) - -main = doMatch (compile ".*xxx.*") "fffxxooxxxlll" --- -true \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects2.scl deleted file mode 100644 index d595ee938..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects2.scl +++ /dev/null @@ -1,21 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "java.util.List" where - data List a - - add :: List a -> a -> Boolean - -importJava "java.util.ArrayList" where - @JavaName "" - arrayList :: Integer -> List a - -singleton :: a -> List a -singleton el = result - where - result = arrayList 1 - r = add result el - -main :: List Integer -main = runProc (singleton (13 :: Integer)) --- -[13] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects3.scl deleted file mode 100644 index 718482938..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects3.scl +++ /dev/null @@ -1,12 +0,0 @@ -effectfulId :: a -> a -effectfulId x = x - -(.) :: (b -> c) -> (a -> b) -> a -> c -(f . g) x = f (g x) - -doubleId = effectfulId . effectfulId - -main :: Integer -main = runProc (doubleId (13 :: Integer)) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects4.scl deleted file mode 100644 index 85138a68a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects4.scl +++ /dev/null @@ -1,12 +0,0 @@ -effectfulId :: a -> a -effectfulId x = x - -//double :: (a -> a) -> a -> a -double f x = f (f x) - -doubleId = double effectfulId - -main :: Integer -main = runProc (doubleId (13 :: Integer)) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects5.scl deleted file mode 100644 index 595b6346b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects5.scl +++ /dev/null @@ -1,13 +0,0 @@ -effectfulId :: a -> a -effectfulId x = x - -(.) :: (b -> c) -> (a -> b) -> a -> c -(f . g) x = f (g x) - -//doubleId :: a -> a -doubleId = effectfulId . effectfulId - -main :: Integer -main = runProc (doubleId (13 :: Integer)) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects6.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects6.scl deleted file mode 100644 index e99dd4fcb..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Effects6.scl +++ /dev/null @@ -1,13 +0,0 @@ -effectfulId :: a -> a -effectfulId x = x - -(.) :: (b -> c) -> (a -> b) -> a -> c -(f . g) x = f (g x) - -doubleId :: a -> a -doubleId = effectfulId . effectfulId - -main :: Integer -main = runProc (doubleId (13 :: Integer)) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/EmptyLet.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/EmptyLet.scl deleted file mode 100644 index 68c662378..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/EmptyLet.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -ex1 = let in 1 -ex2 = let {} in 2 -ex3 = let {a=3} in a - -main = ex1 + ex2 + ex3 --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Equality.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Equality.scl deleted file mode 100644 index acf00e936..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Equality.scl +++ /dev/null @@ -1,41 +0,0 @@ -import "Prelude" - -main = """ -\(newEq () ()) -\(newEq True True) -\(newEq False False) -\(newEq True False) -\(newEq False True) -\(newEq (1::Integer) (1::Integer)) -\(newEq (1::Integer) (2::Integer)) -\(newEq (1::Long) (1::Long)) -\(newEq (1::Long) (2::Long)) -\(newEq (1::Double) (1::Double)) -\(newEq (1::Double) (2::Double)) -\(newEq "a" "a") -\(newEq "a" "b") -\(newEq (Just "a") (Just "a")) -\(newEq (Just "a") (Just "b")) -\(newEq Nothing Nothing) -\(newEq (Just "a") Nothing) -\(newEq Nothing (Just "a")) -""" --- -True -True -True -False -False -True -False -True -False -True -False -True -False -True -False -True -False -False \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Equations1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Equations1.scl deleted file mode 100644 index 613d56bff..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Equations1.scl +++ /dev/null @@ -1,13 +0,0 @@ -import "Prelude" -import "Expressions/Equations" - -main = v - where - v = solveEquations do - listenEquationVariable "a" $ \a -> setEquationVariable "c" (a-1) - setEquationVariable "a" 123 - listenEquationVariable "a" $ \a -> setEquationVariable "b" (a+1) - print v --- -[(a,123), (b,124), (c,122)] - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExistentialData.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExistentialData.scl deleted file mode 100644 index 62130b49f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExistentialData.scl +++ /dev/null @@ -1,23 +0,0 @@ -import "JavaBuiltin" as Java - -(+) = Java.iadd - -data Thunk a = /* forall s. */ Thunk s (s -> a) - -id :: a -> a -id x = x - -runThunk :: Thunk a -> a -runThunk (Thunk s f) = f s - -makeThunk :: a -> Thunk a -makeThunk x = Thunk x id - -mapThunk :: (a -> b) -> Thunk a -> Thunk b -mapThunk f (Thunk s g) = Thunk s (\x -> f (g x)) - -a = makeThunk (13 :: Integer) -b = mapThunk (\x -> x+1) a -main = runThunk b --- -14 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExistentialData2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExistentialData2.scl deleted file mode 100644 index b0299691e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExistentialData2.scl +++ /dev/null @@ -1,7 +0,0 @@ -data Thunk a = /* forall s. */ Thunk s (s -> a) - -mixThunks (Thunk s0 f0) (Thunk s1 f1) = f0 s1 - -main = "Not to be executed!" --- -3:44-3:46: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExpressionParsing.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExpressionParsing.scl deleted file mode 100644 index 6719bf935..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ExpressionParsing.scl +++ /dev/null @@ -1,27 +0,0 @@ -import "Prelude" - -data Exp = Exp String - -expToString :: Exp -> String -expToString (Exp s) = s - -instance Additive Exp where - zero = Exp "0" - Exp a + Exp b = Exp ("(" + a + " + " + b + ")") - -instance Ring Exp where - one = Exp "1" - neg (Exp a) = Exp ("(-" + a + ")") - Exp a * Exp b = Exp ("(" + a + " * " + b + ")") - Exp a - Exp b = Exp ("(" + a + " - " + b + ")") - fromInteger x = Exp (show x) - -a = Exp "a" -b = Exp "b" -c = Exp "c" -d = Exp "d" -e = Exp "e" - -main = expToString (a + b*c + d*e) --- -((a + (b * c)) + (d * e)) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FaultyRecursion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FaultyRecursion.scl deleted file mode 100644 index 523b40877..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FaultyRecursion.scl +++ /dev/null @@ -1,3 +0,0 @@ -fib n = fib --- -1:9-1:12: Expected got a>. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci.scl deleted file mode 100644 index b7b56f50c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "JavaBuiltin" as Java - -(+) = Java.iadd -(-) = Java.isub -(<=) = Java.icmple - -fibonacci x = if x <= (1 :: Integer) - then 1 :: Integer - else fibonacci (x - 1) - + fibonacci (x - 2) - -main = fibonacci 10 --- -89 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci2.scl deleted file mode 100644 index 229145fbc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci2.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -fibonacci :: Integer -> Integer -fibonacci x = if x <= 1 - then 1 - else fibonacci (x - 1) - + fibonacci (x - 2) - -main = fibonacci 10 --- -89 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci3.scl deleted file mode 100644 index d5ce91c60..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Fibonacci3.scl +++ /dev/null @@ -1,20 +0,0 @@ -import "JavaBuiltin" as Java - -class Num a where - (+) :: a -> a -> a - (-) :: a -> a -> a - -instance Num Integer where - (+) = Java.iadd - (-) = Java.isub - -(<=) = Java.icmple - -fibonacci x = if x <= (1 :: Integer) - then 1 :: Integer - else fibonacci (x - (1 :: Integer)) - + fibonacci (x - (2 :: Integer)) - -main = fibonacci 10 --- -89 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FingerTree.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FingerTree.scl deleted file mode 100644 index b81f642f6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FingerTree.scl +++ /dev/null @@ -1,173 +0,0 @@ -import "JavaBuiltin" as Java - -main = foldl Java.iadd (0 :: Integer) (concat (concat (Single (1 :: Integer)) - (Single (2 :: Integer))) (Single (3 :: Integer))) - -data Digit a = Digit1 a - | Digit2 a a - | Digit3 a a a - | Digit4 a a a a -data Node a = Node2 a a | Node3 a a a -data FingerTree a = Empty | Single a | Deep (Digit a) (FingerTree (Node a)) (Digit a) - -insertL :: a -> FingerTree a -> FingerTree a -insertL a Empty = Single a -insertL a (Single b) = Deep (Digit1 a) Empty (Digit1 b) -insertL a (Deep (Digit1 b) m r) = Deep (Digit2 a b) m r -insertL a (Deep (Digit2 b c) m r) = Deep (Digit3 a b c) m r -insertL a (Deep (Digit3 b c d) m r) = Deep (Digit4 a b c d) m r -insertL a (Deep (Digit4 b c d e) m r) = Deep (Digit2 a b) (insertL (Node3 c d e) m) r - -insertR :: FingerTree a -> a -> FingerTree a -insertR Empty a = Single a -insertR (Single a) b = Deep (Digit1 a) Empty (Digit1 b) -insertR (Deep l m (Digit1 a)) b = Deep l m (Digit2 a b) -insertR (Deep l m (Digit2 a b)) c = Deep l m (Digit3 a b c) -insertR (Deep l m (Digit3 a b c)) d = Deep l m (Digit4 a b c d) -insertR (Deep l m (Digit4 a b c d)) e = Deep l (insertR m (Node3 a b c)) (Digit2 d e) - -foldl :: (a -> b -> a) -> a -> FingerTree b -> a -foldl f init Empty = init -foldl f init (Single x) = f init x -foldl f init (Deep l m r) = foldlD (foldl foldlN (foldlD init l) m) r - where - foldlD init (Digit1 a) = f init a - foldlD init (Digit2 a b) = f (f init a) b - foldlD init (Digit3 a b c) = f (f (f init a) b) c - foldlD init (Digit4 a b c d) = f (f (f (f init a) b) c) d - - foldlN init (Node2 a b) = f (f init a) b - foldlN init (Node3 a b c) = f (f (f init a) b) c - -data View a = Nil | Cons a (FingerTree a) - -viewL :: FingerTree a -> View a -viewL Empty = Nil -viewL (Single a) = Cons a Empty -viewL (Deep (Digit1 a) m r) = Cons a tail - where - tail = match viewL m with - Nil -> digitToFingerTree r - Cons h t -> Deep (nodeToDigit h) t r -viewL (Deep (Digit2 a b) m r) = Cons a (Deep (Digit1 a) m r) -viewL (Deep (Digit3 a b c) m r) = Cons a (Deep (Digit2 a b) m r) -viewL (Deep (Digit4 a b c d) m r) = Cons a (Deep (Digit3 a b c) m r) - -concat :: FingerTree a -> FingerTree a -> FingerTree a -concat Empty a = a -concat a Empty = a -concat (Single a) b = insertL a b -concat a (Single b) = insertR a b -concat (Deep l1 m1 r1) (Deep l2 m2 r2) = Deep l1 mm r2 - where - mm = concatAux m1 (digitsToNodes r1 l2) m2 - -// --- Implementation details ------------------------------------------------- - -digitToFingerTree :: Digit a -> FingerTree a -digitToFingerTree (Digit1 a) = Single a -digitToFingerTree (Digit2 a b) = Deep (Digit1 a) Empty (Digit1 b) -digitToFingerTree (Digit3 a b c) = Deep (Digit2 a b) Empty (Digit1 c) -digitToFingerTree (Digit4 a b c d) = Deep (Digit2 a b) Empty (Digit2 c d) - -nodeToDigit :: Node a -> Digit a -nodeToDigit (Node2 a b) = Digit2 a b -nodeToDigit (Node3 a b c) = Digit3 a b c - -concatAux :: FingerTree a -> Digit a -> FingerTree a -> FingerTree a -concatAux Empty ds a = insertLD ds a -concatAux a ds Empty = insertRD a ds -concatAux (Single a) ds b = insertL a (insertLD ds b) -concatAux a ds (Single b) = insertR (insertRD a ds) b -concatAux (Deep l1 m1 r1) ds (Deep l2 m2 r2) = Deep l1 mm r2 - where - mm = concatAux m1 (digitsToNodes3 r1 ds r2) m2 - -insertLD :: Digit a -> FingerTree a -> FingerTree a -insertLD (Digit1 a) t = insertL a t -insertLD (Digit2 a b) t = insertL a (insertL b t) -insertLD (Digit3 a b c) t = insertL a (insertL b (insertL c t)) -insertLD (Digit4 a b c d) t = insertL a (insertL b (insertL c (insertL d t))) - -insertRD :: FingerTree a -> Digit a -> FingerTree a -insertRD t (Digit1 a) = insertR t a -insertRD t (Digit2 a b) = insertR (insertR t a) b -insertRD t (Digit3 a b c) = insertR (insertR (insertR t a) b) c -insertRD t (Digit4 a b c d) = insertR (insertR (insertR (insertR t a) b) c) d - -digitsToNodes :: Digit a -> Digit a -> Digit (Node a) -digitsToNodes (Digit1 a) x = dd1 a x -digitsToNodes (Digit2 a b) x = dd2 a b x -digitsToNodes (Digit3 a b c) x = dd3 a b c x -digitsToNodes (Digit4 a b c d) x = dd4 a b c d x - -digitsToNodes3 :: Digit a -> Digit a -> Digit a -> Digit (Node a) -digitsToNodes3 (Digit1 a) x y = ddd1 a x y -digitsToNodes3 (Digit2 a b) x y = ddd2 a b x y -digitsToNodes3 (Digit3 a b c) x y = ddd3 a b c x y -digitsToNodes3 (Digit4 a b c d) x y = ddd4 a b c d x y - -d2 a b = Digit1 (Node2 a b) -d3 a b c = Digit1 (Node3 a b c) -d4 a b c d = Digit2 (Node2 a b) (Node2 c d) -d5 a b c d e = Digit2 (Node3 a b c) (Node2 d e) -d6 a b c d e f = Digit2 (Node3 a b c) (Node3 d e f) -d7 a b c d e f g = Digit3 (Node3 a b c) (Node2 d e) (Node2 f g) -d8 a b c d e f g h = Digit3 (Node3 a b c) (Node3 d e f) (Node2 g h) -d9 a b c d e f g h i = Digit3 (Node3 a b c) (Node3 d e f) (Node3 g h i) -d10 a b c d e f g h i j = Digit4 (Node3 a b c) (Node3 d e f) (Node2 g h) (Node2 i j) -d11 a b c d e f g h i j k = Digit4 (Node3 a b c) (Node3 d e f) (Node3 g h i) (Node2 j k) -d12 a b c d e f g h i j k l = Digit4 (Node3 a b c) (Node3 d e f) (Node3 g h i) (Node3 j k l) - -dd1 a (Digit1 b) = d2 a b -dd1 a (Digit2 b c) = d3 a b c -dd1 a (Digit3 b c d) = d4 a b c d -dd1 a (Digit4 b c d e) = d5 a b c d e -dd2 a b (Digit1 c) = d3 a b c -dd2 a b (Digit2 c d) = d4 a b c d -dd2 a b (Digit3 c d e) = d5 a b c d e -dd2 a b (Digit4 c d e f) = d6 a b c d e f -dd3 a b c (Digit1 d) = d4 a b c d -dd3 a b c (Digit2 d e) = d5 a b c d e -dd3 a b c (Digit3 d e f) = d6 a b c d e f -dd3 a b c (Digit4 d e f g) = d7 a b c d e f g -dd4 a b c d (Digit1 e) = d5 a b c d e -dd4 a b c d (Digit2 e f) = d6 a b c d e f -dd4 a b c d (Digit3 e f g) = d7 a b c d e f g -dd4 a b c d (Digit4 e f g h) = d8 a b c d e f g h -dd5 a b c d e (Digit1 f) = d6 a b c d e f -dd5 a b c d e (Digit2 f g) = d7 a b c d e f g -dd5 a b c d e (Digit3 f g h) = d8 a b c d e f g h -dd5 a b c d e (Digit4 f g h i) = d9 a b c d e f g h i -dd6 a b c d e f (Digit1 g) = d7 a b c d e f g -dd6 a b c d e f (Digit2 g h) = d8 a b c d e f g h -dd6 a b c d e f (Digit3 g h i) = d9 a b c d e f g h i -dd6 a b c d e f (Digit4 g h i j) = d10 a b c d e f g h i j -dd7 a b c d e f g (Digit1 h) = d8 a b c d e f g h -dd7 a b c d e f g (Digit2 h i) = d9 a b c d e f g h i -dd7 a b c d e f g (Digit3 h i j) = d10 a b c d e f g h i j -dd7 a b c d e f g (Digit4 h i j k) = d11 a b c d e f g h i j k -dd8 a b c d e f g h (Digit1 i) = d9 a b c d e f g h i -dd8 a b c d e f g h (Digit2 i j) = d10 a b c d e f g h i j -dd8 a b c d e f g h (Digit3 i j k) = d11 a b c d e f g h i j k -dd8 a b c d e f g h (Digit4 i j k l) = d12 a b c d e f g h i j k l - -ddd1 a (Digit1 b) y = dd2 a b y -ddd1 a (Digit2 b c) y = dd3 a b c y -ddd1 a (Digit3 b c d) y = dd4 a b c d y -ddd1 a (Digit4 b c d e) y = dd5 a b c d e y -ddd2 a b (Digit1 c) y = dd3 a b c y -ddd2 a b (Digit2 c d) y = dd4 a b c d y -ddd2 a b (Digit3 c d e) y = dd5 a b c d e y -ddd2 a b (Digit4 c d e f) y = dd6 a b c d e f y -ddd3 a b c (Digit1 d) y = dd4 a b c d y -ddd3 a b c (Digit2 d e) y = dd5 a b c d e y -ddd3 a b c (Digit3 d e f) y = dd6 a b c d e f y -ddd3 a b c (Digit4 d e f g) y = dd7 a b c d e f g y -ddd4 a b c d (Digit1 e) y = dd5 a b c d e y -ddd4 a b c d (Digit2 e f) y = dd6 a b c d e f y -ddd4 a b c d (Digit3 e f g) y = dd7 a b c d e f g y -ddd4 a b c d (Digit4 e f g h) y = dd8 a b c d e f g h y - --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl deleted file mode 100644 index affa2e66f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" - -f p l = (foldl (+) (map ((+)p) l)) + p --- -3:1-3:39: Couldn't simplify all effect subsumptions away. The current compiler cannot handle this situation. Try adding more type annotations. -3:25-3:31: Type [a b] -> a b is not a subtype of a. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldlBuild1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldlBuild1.scl deleted file mode 100644 index 21dfdea64..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldlBuild1.scl +++ /dev/null @@ -1,18 +0,0 @@ -import "Prelude" - -inc :: Ref Integer -> Integer -inc r = do - v = getRef r - newV = v+1 - r := newV - newV - -main = do - r = ref 0 - // Because both map and for get side-effectful functions - // as parameters, the fusion is not allowed. - l = map (\_ -> inc r) [1..4] - for l (\i -> r := i+1) - getRef r --- -5 diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldlBuild2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldlBuild2.scl deleted file mode 100644 index 2078fb7c2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FoldlBuild2.scl +++ /dev/null @@ -1,16 +0,0 @@ -import "Prelude" - -inc :: Ref Integer -> Integer -inc r = do - v = getRef r - newV = v+1 - r := newV - newV - -main = do - r = ref 0 - l = map (\_ -> inc r) [1..4] - r := 4 // Map must be executed before this statement - foldl (+) 0 l --- -10 diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall1.scl deleted file mode 100644 index 32e51a716..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall1.scl +++ /dev/null @@ -1,8 +0,0 @@ - -id :: forall a. a -> a - // ^ not usually needed, but we test just that this is possible -id x = x - -main = id (3 :: Integer) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall2.scl deleted file mode 100644 index 97d1c3510..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall2.scl +++ /dev/null @@ -1,9 +0,0 @@ - -data List a = Nil | Cons a (List a) - -build :: (forall l. l -> (a -> l -> l) -> l) -> List a -build f = f Nil Cons - -main = build (\nil cons -> cons (1 :: Integer) (cons (2 :: Integer) nil)) --- -(Cons 1 (Cons 2 Nil)) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall3.scl deleted file mode 100644 index 018a2a0be..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Forall3.scl +++ /dev/null @@ -1,11 +0,0 @@ - -data List a = Nil | Cons a (List a) - -build :: (forall l. l -> (a -> l -> l) -> l) -> List a -build f = f Nil Cons - -main = build (\nil cons -> cons (1 :: Integer) (Cons (2 :: Integer) nil)) - // ^^^^ --- -7:48-7:73: Expected got . -7:69-7:72: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Formula.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Formula.scl deleted file mode 100644 index 10eafb061..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Formula.scl +++ /dev/null @@ -1,131 +0,0 @@ -import "Prelude" - -data Formula a = TrueF - | FalseF - | XorF (Formula a) (Formula a) - | AndF (Formula a) (Formula a) - | ConditionF a - | NextF (Formula a) - | UntilF (Formula a) (Formula a) - -deriving instance (Ord a) => Ord (Formula a) - -instance (Show a) => Show (Formula a) where - sb <+ TrueF = sb << "true" - sb <+ FalseF = sb << "false" - sb <+ XorF a b = sb << "(" <+ a << " `XorF` " <+ b << ")" - sb <+ AndF a b = sb << "(" <+ a << " &&& " <+ b << ")" - sb <+ ConditionF c = sb <+ c - sb <+ NextF a = sb << "(next " <+ a << ")" - sb <+ UntilF a b = sb << "(" <+ a << " `UntilF` " <+ b << ")" - -xorF FalseF f2 = f2 -xorF f1 FalseF = f1 -xorF f1@(XorF h1 t1) f2@(XorF h2 t2) = - let cmp = compare h1 h2 - in if cmp < 0 - then XorF h1 (xorF t1 f2) - else if cmp > 0 - then XorF h2 (xorF f1 t2) - else xorF t1 t2 -xorF f1@(XorF h1 t1) f2 = - let cmp = compare h1 f2 - in if cmp < 0 - then XorF h1 (xorF t1 f2) - else if cmp > 0 - then XorF f2 f1 - else t1 -xorF f1 f2@(XorF h2 t2) = - let cmp = compare f1 h2 - in if cmp < 0 - then XorF f1 f2 - else if cmp > 0 - then XorF h2 (xorF f1 t2) - else t2 -xorF f1 f2 = - let cmp = compare f1 f2 - in if cmp < 0 - then XorF f1 f2 - else if cmp > 0 - then XorF f2 f1 - else TrueF - -notF f = xorF TrueF f - -TrueF &&& f2 = f2 -f1 &&& TrueF = f1 -FalseF &&& _ = FalseF -_ &&& FalseF = FalseF -XorF h1 t1 &&& f2 = xorF (h1 &&& f2) (t1 &&& f2) -f1 &&& XorF h2 t2 = xorF (f1 &&& h2) (f1 &&& t2) -f1@(AndF h1 t1) &&& f2@(AndF h2 t2) = - let cmp = compare h1 h2 - in if cmp < 0 - then AndF h1 (t1 &&& f2) - else if cmp > 0 - then AndF h2 (f1 &&& t2) - else AndF h1 (t1 &&& t2) -f1@(AndF h1 t1) &&& f2 = - let cmp = compare h1 f2 - in if cmp < 0 - then AndF h1 (t1 &&& f2) - else if cmp > 0 - then AndF f2 f1 - else f1 -f1 &&& f2@(AndF h2 t2) = - let cmp = compare f1 h2 - in if cmp < 0 - then AndF f1 f2 - else if cmp > 0 - then AndF h2 (f1 &&& t2) - else f2 -f1 &&& f2 = - let cmp = compare f1 f2 - in if cmp < 0 - then AndF f1 f2 - else if cmp > 0 - then AndF f2 f1 - else f1 - -f1 ||| f2 = xorF (xorF f1 f2) (f1 &&& f2) - -eval :: Ord a => (a -> Boolean) -> Formula a -> Formula a -eval s TrueF = TrueF -eval s FalseF = FalseF -eval s (XorF f1 f2) = xorF (eval s f1) (eval s f2) -eval s (AndF f1 f2) = eval s f1 &&& eval s f2 -eval s (ConditionF c) = if s c then TrueF else FalseF -eval s (NextF f) = f -eval s (UntilF f1 f2) = eval s f2 ||| (eval s f1 &&& UntilF f1 f2) - -// Concrete conditions - -data V = V String (Ref Boolean) - -instance Ord V where - compare (V a _) (V b _) = compare a b -instance Show V where - sb <+ V a _ = sb <+ a - -cond :: String -> Ref Boolean -> Formula V -cond name ref = ConditionF (V name ref) - -// Testing - -x = ref True -y = ref False - -f = cond "x" x `UntilF` cond "y" y - -evalV = eval (\(V _ c) -> getRef c) - -main = do - print (evalV f) - x := False - print (evalV f) - y = ref True - print (evalV f) - x := True - print (evalV f) --- -() \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic.scl deleted file mode 100644 index 1ac2e7704..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = (fromDynamic (toDynamic 42) :: String) + "foo" --- -42foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic2.scl deleted file mode 100644 index 1b6c1d99d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic2.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = (fromDynamic (toDynamic "42") :: Integer) - 2 --- -40 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic3.scl deleted file mode 100644 index a3318d4de..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic3.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = arrayToList (fromDynamic (toDynamic ["42"]) :: (Array Integer)) --- -[42] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic4.scl deleted file mode 100644 index fb4c32088..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic4.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" -import "Vector" - -main = (fromDynamic (toDynamic ["42"]) :: (Vector Double))!0 --- -42.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic5.scl deleted file mode 100644 index d0d0fd3a2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FromDynamic5.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" -import "Vector" - -main = (fromDynamic (toDynamic (mvector [42.0]))) :: [Integer] --- -[42] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionFunctor.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionFunctor.scl deleted file mode 100644 index f63481032..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionFunctor.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -// vvvvvv mistake, parantheses missing -instance Functor (->) a where - map f g x = f (g x) - -main = "Not to be executed." --- -4:1-5:24: Wrong number of parameters to type class Functor. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionalDependencies1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionalDependencies1.scl deleted file mode 100644 index 203de1dba..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionalDependencies1.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -class Container c a b | c -> a, c -> b where - get :: c -> a -> b - -instance Container [a] Integer a where - get = (!) - -main = get [1,2,3,4,5] 3 --- -4 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionalDependencies2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionalDependencies2.scl deleted file mode 100644 index 707bb9e2e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctionalDependencies2.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" - -class Mul a b c | a b -> c where - mul :: a -> b -> c - -instance Mul Integer Integer Integer where - mul = (*) - -main :: Integer -main = mul (mul (1 :: Integer) (2 :: Integer)) (3 :: Integer) --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Functor.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Functor.scl deleted file mode 100644 index 6bbd35979..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Functor.scl +++ /dev/null @@ -1,23 +0,0 @@ -import "JavaBuiltin" as Java - -class Functor f where - map :: (a -> b) -> f a -> f b - -data Foo a = Foo a - -instance Functor Foo where - map f (Foo x) = Foo (f x) - -instance Functor Maybe where - map f Nothing = Nothing - map f (Just x) = Just (f x) - -data List a = Nil | Cons a (List a) - -instance Functor List where - map f Nil = Nil - map f (Cons h t) = Cons (f h) (map f t) - -main = map (map (Java.iadd 1)) (Cons Nothing (Cons (Just (1 :: Integer)) Nil)) --- -(Cons null (Cons 2 Nil)) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctorM1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctorM1.scl deleted file mode 100644 index 5e1874e31..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/FunctorM1.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -main = sequence [[1,2], [3,4], [5,6]] -/* - x <- [1,2] - y <- [3,4] - z <- [5,6] - return [x,y,z] -*/ --- -[[1, 3, 5], [1, 3, 6], [1, 4, 5], [1, 4, 6], [2, 3, 5], [2, 3, 6], [2, 4, 5], [2, 4, 6]] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Generalization.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Generalization.scl deleted file mode 100644 index e5503349f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Generalization.scl +++ /dev/null @@ -1,13 +0,0 @@ -import "JavaBuiltin" as Java - -(+) = Java.iadd - -data Foo = Foo Integer - -escapeFoo (Foo x) = x - -id x = x - -main = id (3 :: Integer) + escapeFoo (id (Foo (4 :: Integer))) --- -7 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GenericMutualRecursion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GenericMutualRecursion.scl deleted file mode 100644 index 24c5858d6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GenericMutualRecursion.scl +++ /dev/null @@ -1,12 +0,0 @@ -// Idea of this test is to ensure that generic type variables -// and constraints are handled correctly with mutually recursive -// functions - -import "Prelude" - -deepId count x = deepId2 count x -deepId2 count x = if count <= 0 then x else deepId (count-1) x - -main = deepId 5 "FOO" --- -FOO \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GlobalVariables.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GlobalVariables.scl deleted file mode 100644 index c6dc99edf..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GlobalVariables.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "Prelude" - -global :: Ref Integer -global = ref 0 - -inc :: () -inc = global := getRef global + 1 - -main = do - inc - inc - getRef global --- -2 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GraphPrelude.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GraphPrelude.scl deleted file mode 100644 index ddb2d58be..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GraphPrelude.scl +++ /dev/null @@ -1,41 +0,0 @@ - -/** - * Databoard - */ -data Binding // Private -class Serializable a where - getBinding :: Binding - -/** - * Reading graph - */ -data Resource -data ReadGraph // Private -class ReadTransaction where - getGraph :: ReadGraph - -resource :: ReadTransaction => String -> Resource -(#) :: ReadTransaction => Resource -> Resource -> [Resource] -valueOf :: ReadTransaction => Serializable a => Resource -> a - -/** - * Writing graph - */ -data WriteGraph // Private -data Graph a = Graph (WriteGraph -> a) - -instance Monad Graph where - return x = Graph (\_ -> x) - Graph g >>= f = \wg -> f (g wg) wg - map f (Graph g) = Graph (f . g) - -newResource :: Graph Resource -newResource = Graph __WriteGraph_newResource -newLiteral :: Serializable a => a -> Graph Resource -newLiteral = Graph (\wg -> - literal = __WriteGraph_newResource wg - _ = __WriteGraph_claimValue wg literal a getBinding - literal -) -statement :: Resource -> Resource -> Resource -> Graph () -statement s p o = Graph (\wg -> __WriteGraph_claim wg s p o) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GuardedExpressionBug.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GuardedExpressionBug.scl deleted file mode 100644 index c0d45f161..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/GuardedExpressionBug.scl +++ /dev/null @@ -1,9 +0,0 @@ -tableIndex :: Double -> Double -tableIndex x - | True = x - where - f _ = x - -main = "Foo" --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Guards1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Guards1.scl deleted file mode 100644 index db3b43833..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Guards1.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -fib :: Integer -> Integer -fib x | x <= 2 = 1 - | True = fib (x-1) + fib (x-2) - -main = fib 13 --- -233 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Guards2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Guards2.scl deleted file mode 100644 index 88734c1ac..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Guards2.scl +++ /dev/null @@ -1,10 +0,0 @@ -import "Prelude" - -fib :: Integer -> Integer -fib x = match x with - v | v <= 2 -> 1 - | True -> fib (v-1) + fib (v-2) - -main = fib 13 --- -233 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IdAsOperator.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IdAsOperator.scl deleted file mode 100644 index 576ff86f1..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IdAsOperator.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 5 minus - -minus = Java.isub - -main = 5 `minus` 3 `minus` 2 --- -0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IllegalChar.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IllegalChar.scl deleted file mode 100644 index 371492bb7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IllegalChar.scl +++ /dev/null @@ -1,3 +0,0 @@ -a = Â¤ --- -1:5-1:6: Illegal character 'Â¤'. diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ImportJavaConstructor.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ImportJavaConstructor.scl deleted file mode 100644 index 8c45e438b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ImportJavaConstructor.scl +++ /dev/null @@ -1,18 +0,0 @@ - -@JavaType "org.simantics.scl.compiler.elaboration.expressions.Expression" -data Expression = - @JavaType "org/simantics/scl/compiler/elaboration/expressions/EIntegerLiteral" - @FieldNames [value] - EIntegerLiteral String - | @JavaType "org.simantics.scl.compiler.elaboration.expressions.ERealLiteral" - @FieldNames [value] - ERealLiteral String - -changeType :: Expression -> Expression -changeType (EIntegerLiteral value) = ERealLiteral value -changeType (ERealLiteral value) = EIntegerLiteral value - -main :: Expression -main = changeType (EIntegerLiteral "123") --- -123 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ImportRef.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ImportRef.scl deleted file mode 100644 index 9fb6f62d2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ImportRef.scl +++ /dev/null @@ -1,18 +0,0 @@ -importJava "org.simantics.scl.runtime.procedure.Ref" where - data Ref a - - @JavaName "" - ref :: a -> (Ref a) - - @JavaName "value" - getRef :: Ref a -> a - - @JavaName "value" - (:=) :: Ref a -> a -> () - -main = do - r = ref (13 :: Integer) - r := (14 :: Integer) - getRef r --- -14 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InconsistentArity.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InconsistentArity.scl deleted file mode 100644 index 82a966892..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InconsistentArity.scl +++ /dev/null @@ -1,4 +0,0 @@ -f a b = a -f x = x --- -2:1-2:4: Inconsistent arity. This case has arity 1 while previous cases had arity 2. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InconsistentIndentation.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InconsistentIndentation.scl deleted file mode 100644 index bd732cf21..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InconsistentIndentation.scl +++ /dev/null @@ -1,5 +0,0 @@ -class Foo a where - x :: a - y :: a --- -3:3-3:4: Unexpected token 'y' (ID). Expected one of EOF, RBRACE, SEMICOLON. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IndentationAndParenthesis.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IndentationAndParenthesis.scl deleted file mode 100644 index 3a8dc3de7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/IndentationAndParenthesis.scl +++ /dev/null @@ -1,16 +0,0 @@ -// The last character of the program is an extra closing parenthesis -data List a = Nil | Cons a (List a) - -first Nil = 0 -first (Cons x _) = x - -reverse l = reverseAux Nil l - where - reverseAux accum Nil = accum - reverseAux accum (Cons h t) = reverseAux (Cons h accum) t - -main = first (reverse l) - where - l = Cons 1 (Cons 2 (Cons 3 Nil))) --- -14:37-14:38: No corresponding opening parenthesis for ')'. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Index.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Index.scl deleted file mode 100644 index 8a98aec03..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Index.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -f :: Integer -> Maybe Integer -f = index [(1,2),(2,4),(3,6),(4,8)] - -main = f 3 --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Inline1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Inline1.scl deleted file mode 100644 index 118abc4c5..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Inline1.scl +++ /dev/null @@ -1,5 +0,0 @@ -main = id "Foo" - where - id x = x --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InlineLoop.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InlineLoop.scl deleted file mode 100644 index df8433c5c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InlineLoop.scl +++ /dev/null @@ -1,9 +0,0 @@ -data SList a = Nil | Cons a (SList a) - -@inline -copy (Cons h t) = Cons h (copy t) -copy l = l - -main = "OK" --- -OK \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceHierarchy.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceHierarchy.scl deleted file mode 100644 index 1c751f397..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceHierarchy.scl +++ /dev/null @@ -1,26 +0,0 @@ -import "Prelude" hiding (zero, one) - -class MyAdditive a where - zero :: a - -class (MyAdditive a) => MyRing a where - one :: a - -instance MyAdditive Integer where - zero = 0 - -instance MyRing Integer where - one = 1 - -data Poly a = Poly [a] - -instance (MyAdditive a) => MyAdditive (Poly a) where - zero = Poly [] - -instance (MyRing a) => MyRing (Poly a) where - one = Poly [one] - -main :: Poly Integer -main = one --- -[1] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceIsTypoedAsClass.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceIsTypoedAsClass.scl deleted file mode 100644 index f3973cccd..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceIsTypoedAsClass.scl +++ /dev/null @@ -1,9 +0,0 @@ -class Functor f where - map :: (a -> b) -> f a -> f b - -data Foo a = Foo a - -class Functor Foo where - map f (Foo x) = Foo (f x) --- -6:1-7:30: Class Functor has already been defined in this module. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceTypeVariables.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceTypeVariables.scl deleted file mode 100644 index e4ee646a9..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InstanceTypeVariables.scl +++ /dev/null @@ -1,10 +0,0 @@ -class Foo a b where - foo :: a -> b - -instance Foo a a where - foo x = x :: a - -main = "OK" --- -OK - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidClass1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidClass1.scl deleted file mode 100644 index 796f92c29..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidClass1.scl +++ /dev/null @@ -1,4 +0,0 @@ -class Foo a where - infix 3 (+) --- -2:5-2:16: Invalid declaration under class definition. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidEncoding.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidEncoding.scl deleted file mode 100644 index 513b36f58..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidEncoding.scl +++ /dev/null @@ -1,3 +0,0 @@ -main = "Hello wï¿½rld!" --- -1:16-1:17: Character does not conform to UTF-8 encoding. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidInstance1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidInstance1.scl deleted file mode 100644 index 35064c645..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidInstance1.scl +++ /dev/null @@ -1,8 +0,0 @@ -class Foo a where - (+) :: a -> a -> a - -instance Foo Double where - infix 3 (+) - x + y = x --- -5:5-5:16: Invalid declaration under instance definition. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidJavaTypeAnnotation.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidJavaTypeAnnotation.scl deleted file mode 100644 index 9f7270cd1..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidJavaTypeAnnotation.scl +++ /dev/null @@ -1,6 +0,0 @@ -@JavaType 123 "sdf" -data Foo - -main = "Not to be executed" --- -1:1-1:20: Invalid parameters. Expected @JavaType "className". \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds.scl deleted file mode 100644 index a18c062ee..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds.scl +++ /dev/null @@ -1,7 +0,0 @@ - -data List a = Nil | Cons a (List a) - -foo :: List -foo = foo --- -4:8-4:12: Expected a type with kind * but got * -> *. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds2.scl deleted file mode 100644 index ffdf0a9f6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds2.scl +++ /dev/null @@ -1,9 +0,0 @@ -class Functor f where - map :: (a -> b) -> f a -> f b - -instance Functor Integer where - map = fail "Not implemented." - -main = "Not to be executed." --- -4:18-4:25: Expected a type with kind * -> * but got *. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds3.scl deleted file mode 100644 index 445dd7ead..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidKinds3.scl +++ /dev/null @@ -1,5 +0,0 @@ - -data List a = Nil | Cons a List - --- -2:28-2:32: Expected a type with kind * but got ?a -> *. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl deleted file mode 100644 index 8897d43dd..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl +++ /dev/null @@ -1,4 +0,0 @@ - -main = \ /* no parameters */ -> 3 --- -2:30-2:32: Unexpected token '->' (ARROW). Expected one of ATTACHED_HASH, BEGIN_STRING, BLANK, CHAR, DO, ENFORCE, EQ, ESCAPED_SYMBOL, FLOAT, ID, IF, INTEGER, LAMBDA, LBRACKET, LET, LPAREN, MATCH, MDO, SELECT, SELECT_DISTINCT, SELECT_FIRST, TRANSFORMATION, WHEN. diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidModule.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidModule.scl deleted file mode 100644 index 7cf5f959f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidModule.scl +++ /dev/null @@ -1,3 +0,0 @@ -import "INVALID_MODULE" as Foo --- -1:1-1:31: Failed to import INVALID_MODULE, because it does not exist. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern1.scl deleted file mode 100644 index 5ba56cffe..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern1.scl +++ /dev/null @@ -1,7 +0,0 @@ -id x = x - -f (\x -> x) y = y - -main = f id "Foo" --- -3:3-3:12: Pattern was expected here. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern2.scl deleted file mode 100644 index 2bf9613e6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern2.scl +++ /dev/null @@ -1,5 +0,0 @@ -if x then y else z = x - -main = "Not to be executed." --- -1:1-1:19: Illegal left hand side of the definition. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl deleted file mode 100644 index 460a9bdfe..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl +++ /dev/null @@ -1,8 +0,0 @@ -foo x = b - where - if a then b else c = x - -main = "Not to be executed." --- -1:9-1:10: Couldn't resolve variable b. -3:5-3:23: Pattern was expected here. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern4.scl deleted file mode 100644 index 11dfd0702..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidPattern4.scl +++ /dev/null @@ -1,7 +0,0 @@ -import "Prelude" - -a # b # c = a + b + c - -main = "Not to be executed." --- -3:1-3:10: Illegal left hand side of the definition. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidRuleset1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidRuleset1.scl deleted file mode 100644 index e53520b28..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidRuleset1.scl +++ /dev/null @@ -1,10 +0,0 @@ -data Fact = Foo | Bar - -rs = ruleset - Foo => Bar - -main = "Not to be executed." --- -4:10-4:13: Expected - <[Fact]> got - . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidRuleset2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidRuleset2.scl deleted file mode 100644 index 675ee4985..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidRuleset2.scl +++ /dev/null @@ -1,11 +0,0 @@ -data Fact = Foo1 | Foo2 -data Fact2 = Bar - -rs = ruleset - Foo1, Foo2 <=> [Bar] - -main = "Not to be executed." --- -5:19-5:22: Expected - got - . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidTypeClassInstance1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidTypeClassInstance1.scl deleted file mode 100644 index 8860c3b01..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/InvalidTypeClassInstance1.scl +++ /dev/null @@ -1,9 +0,0 @@ - -class Foo a where - foo :: a -> Integer - -instance Foo Long where - foo x = x - --- -6:13-6:14: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaAccess1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaAccess1.scl deleted file mode 100644 index 0576f4385..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaAccess1.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "java.lang.String" where - substring :: String -> Integer -> Integer -> String - -main = substring "01234" 1 4 --- -123 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaConstructors.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaConstructors.scl deleted file mode 100644 index d3ee020f9..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaConstructors.scl +++ /dev/null @@ -1,11 +0,0 @@ - -@JavaType "org.simantics.scl.runtime.tuple.Tuple3" -data Tuple3 a b c = - @FieldNames [c0, c1, c2] - Tuple3 a b c - -toTuple (Tuple3 x y z) = (x, y, z) - -main = toTuple (Tuple3 "x" "y" "z") --- -(x,y,z) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaMethods.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaMethods.scl deleted file mode 100644 index d51bd4bb8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaMethods.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "java.lang.Integer" where - @JavaName "parseInt" - stringToInteger :: String -> Integer - -main = stringToInteger "13" --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaTypes.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaTypes.scl deleted file mode 100644 index 830c5a426..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/JavaTypes.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "java.math.BigInteger" where - data BigInteger - - @JavaName "add" - (+) :: BigInteger -> BigInteger -> BigInteger - - @JavaName "" - fromString :: String -> BigInteger - -main = fromString "123" + fromString "234" --- -357 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Kinds1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Kinds1.scl deleted file mode 100644 index 2f2f0d1d1..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Kinds1.scl +++ /dev/null @@ -1,15 +0,0 @@ -class Functor f where - map :: (a -> b) -> f a -> f b - -data Either a b = Left a | Right b - -instance Functor (Either a) where - map _ (Left x) = Left x - map f (Right y) = Right (f y) - -id :: Integer -> Integer -id x = x - -main = map id (Left (12 :: Integer)) --- -(Left 12) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LP.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LP.scl deleted file mode 100644 index 0c3ddc121..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LP.scl +++ /dev/null @@ -1,86 +0,0 @@ -import "Prelude" - -importJava "gnu.trove.map.hash.TIntFloatHashMap" where - data LMap - - @JavaName adjustOrPutValue - adjustLMap_ :: LMap -> Integer -> Float -> Float -> () - -@inline -adjustLMap :: LMap -> Integer -> Float -> () -adjustLMap m k v = adjustLMap_ m k v v - -data LPTerm = LPTerm (LMap -> Float -> ()) - -instance Additive LPTerm where - @inline - zero = LPTerm (\_ _ -> ()) - @inline - LPTerm a + LPTerm b = LPTerm (\m s -> do a m s ; b m s) - sum ts = LPTerm (\m s -> for ts (\(LPTerm t) -> t m s)) - -instance Ring LPTerm where - @inline - neg (LPTerm a) = LPTerm (\m s -> a m (-s)) - @inline - LPTerm a - LPTerm b = LPTerm (\m s -> do a m s ; b m (-s)) - @inline - fromInteger c = LPTerm (\m s -> adjustLMap m (-1) (fromInteger c*s)) - @inline - one = LPTerm (\m s -> adjustLMap m (-1) s) - _ * _ = fail "Multiplication is not supported." - -data LPProblem = LPProblem (Ref Integer) - -newProblem :: () -> LPProblem -newProblem _ = LPProblem (ref 0) - -newVar :: LPProblem -> LPTerm -newVar (LPProblem varCounter) = do - curId = getRef varCounter - varCounter := curId + 1 - LPTerm (\m s -> adjustLMap m curId s) - -infixl 7 (**) - -@inline -(**) :: Float -> LPTerm -> LPTerm -s0 ** LPTerm t = LPTerm (\m s -> t m (s0*s)) - -/* -data LPTerm = LPTerm Double (Map.T String Double) - -instance Additive LPTerm where - zero = LPTerm 0 Map.empty - LPTerm c1 m1 + LPTerm c2 m2 = LPTerm (c1+c2) (Map.merge (+) m1 m2) - -instance Ring LPTerm where - one = LPTerm 1 Map.empty - neg (LPTerm c m) = LPTerm (-c) (map neg m) - LPTerm c1 m1 - LPTerm c2 m2 = LPTerm (c1-c2) (Map.merge (-) m1 m2) - - LPTerm c1 [] * LPTerm c2 m2 = LPTerm (c1*c2) (Map.merge (\x -> c1*x) m2) - LPTerm c1 m1 * LPTerm c2 [] = LPTerm (c1*c2) (Map.merge (\x -> c2*x) m1) - _ * _ = fail "Invalid expression: not linear." - - fromInteger i = LPTerm (fromInteger i) Map.empty - -data LPConstraint = LPConstraint String LPTerm - -(>==) :: LPTerm -> LPTerm -> String -> [LPConstraint] -(a >== b) name = [LPConstraint name (a-b)] - -(<==) :: LPTerm -> LPTerm -> String -> [LPConstraint] -(a <== b) name = [LPConstraint name (b-a)] - -*/ - -testi () = do - problem = newProblem () - a = newVar problem - b = newVar problem - 3 ** a + 4 ** b + 15 - -main = "OK" --- -OK \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Lambda.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Lambda.scl deleted file mode 100644 index 2316b30b4..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Lambda.scl +++ /dev/null @@ -1,13 +0,0 @@ - -data List a = Nil | Cons a (List a) - -map :: (a -> b) -> List a -> List b -map f Nil = Nil -map f (Cons h t) = Cons (f h) (map f t) - -constMap :: a -> List b -> List a -constMap c = map (\x -> c) - -main = constMap (5 :: Integer) (Cons (1 :: Integer) (Cons (2 :: Integer) (Cons (3 :: Integer) Nil))) --- -(Cons 5 (Cons 5 (Cons 5 Nil))) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Layout1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Layout1.scl deleted file mode 100644 index f68e9a6a7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Layout1.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" - -foobar x = match x with - Left lt -> foo lt - Right rt -> bar rt - where - foo x = "left " + show x - bar x = "right " + show x - -main = foobar (Left "ASD" :: Either String String) --- -left "ASD" \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/List.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/List.scl deleted file mode 100644 index b746c31ca..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/List.scl +++ /dev/null @@ -1,7 +0,0 @@ - -data List a = Nil | Cons a (List a) - -main :: List Integer -main = Cons (3 :: Integer) Nil --- -(Cons 3 Nil) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListError1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListError1.scl deleted file mode 100644 index 0fece992c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListError1.scl +++ /dev/null @@ -1,7 +0,0 @@ -a :: [Integer] -a = a - -main :: [Double] -main = [x | x <- a] --- -5:9-5:10: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListError2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListError2.scl deleted file mode 100644 index 135e2704b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListError2.scl +++ /dev/null @@ -1,7 +0,0 @@ -a :: Integer -a = a - -main :: [Integer] -main = [x | x <- a] --- -5:18-5:19: Expected <[a]> got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax.scl deleted file mode 100644 index 1747a6f62..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax.scl +++ /dev/null @@ -1,7 +0,0 @@ -import "Prelude" - -a = [1,2] -b = [5,9] -main = [(x,y) | x <- a, y <- b] --- -[(1,5), (1,9), (2,5), (2,9)] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax10.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax10.scl deleted file mode 100644 index 726dba5c8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax10.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" - -dists l = sum [sqrt (dx*dx + dy*dy) - | i <- [0..length l-2] - , (x1,y1) = l!i - , (x2,y2) = l!(i+1) - , dx = x1-x2 - , dy = y1-y2 ] - -main = dists [(0,0),(1,1),(2,0)] --- -2.8284271247461903 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax11.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax11.scl deleted file mode 100644 index 15f044190..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax11.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -dists l = sum [sqrt (x*x+y*y) - | (x,y) <- l ] - -main = dists [(0,0),(1,1),(2,0)] --- -3.414213562373095 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax12.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax12.scl deleted file mode 100644 index 8b18eb3d0..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax12.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = foldl (+) 0 [x | y <- [1..10], x <- [1..y]] --- -220 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax2.scl deleted file mode 100644 index e020731a7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax2.scl +++ /dev/null @@ -1,7 +0,0 @@ -import "Prelude" - -a = [1,2] -b = [5,9] -main = [(x, y) | x <- a, x==2, y <- b] --- -[(2,5), (2,9)] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax3.scl deleted file mode 100644 index c6cbbca7d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax3.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = [1,2,3,4] --- -[1, 2, 3, 4] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax4.scl deleted file mode 100644 index a95063523..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax4.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" - -main :: [Integer] -main = [y | x <- [1..3], y = x+4] --- -[5, 6, 7] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax5.scl deleted file mode 100644 index 6ba833078..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax5.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -a = [1,2,3,4] - -main :: [Integer] -main = [x+y | x <- a, y <- a, x!=y] --- -[3, 4, 5, 3, 5, 6, 4, 5, 7, 5, 6, 7] diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax6.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax6.scl deleted file mode 100644 index a3e08c47d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax6.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" - -main :: [Integer] -main = [x | x <- [1..10], then take 3] --- -[1, 2, 3] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax7.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax7.scl deleted file mode 100644 index 54cf21c54..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax7.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" - -main :: [Integer] -main = [x | x <- [2,4,3,5,4,6], then sortBy by x] --- -[2, 3, 4, 4, 5, 6] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax8.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax8.scl deleted file mode 100644 index ac5ce5765..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax8.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" - -a :: [Either Integer Integer] -a = [Left 1, Right 2, Left 3, Right 4] - -lefts :: [Either a b] -> [a] -lefts l = [x | Left x <- l] - -main :: [Integer] -main = lefts a --- -[1, 3] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax9.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax9.scl deleted file mode 100644 index 83de25518..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntax9.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" - -a :: [Either Integer Integer] -a = [Left 1, Right 2, Left 3, Right 4] - -lefts :: [Either a b] -> [a] -lefts l = [x | y <- l, Left x = y] - -main :: [Integer] -main = lefts a --- -[1, 3] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntaxWithoutPrelude.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntaxWithoutPrelude.scl deleted file mode 100644 index 8806f93a3..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ListSyntaxWithoutPrelude.scl +++ /dev/null @@ -1,3 +0,0 @@ -main = [1 :: Integer,2 :: Integer,3 :: Integer] --- -[1, 2, 3] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions.scl deleted file mode 100644 index 0e4690a65..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions.scl +++ /dev/null @@ -1,12 +0,0 @@ - -data List a = Nil | Cons a (List a) - -reverse :: List a -> List a -reverse l = do - reverseAux accum Nil = accum - reverseAux accum (Cons h t) = reverseAux (Cons h accum) t - reverseAux Nil l - -main = reverse (Cons (1 :: Integer) (Cons (2 :: Integer) (Cons (3 :: Integer) (Cons (4 :: Integer) Nil)))) --- -(Cons 4 (Cons 3 (Cons 2 (Cons 1 Nil)))) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions2.scl deleted file mode 100644 index f17a8beee..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions2.scl +++ /dev/null @@ -1,14 +0,0 @@ - -data List a = Nil | Cons a (List a) - -hasEvenLength :: List a -> Boolean -hasEvenLength l = do - even Nil = True - even (Cons _ t) = odd t - odd Nil = False - odd (Cons _ t) = even t - even l - -main = hasEvenLength (Cons (1 :: Integer) (Cons (2 :: Integer) (Cons (3 :: Integer) (Cons (4 :: Integer) Nil)))) --- -true \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions3.scl deleted file mode 100644 index 71a193f6e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions3.scl +++ /dev/null @@ -1,10 +0,0 @@ - -data Step s = Skip s - -next :: (s -> Step s) -> s -> Step s -next next0 ss = match next0 ss with - Skip ss -> Skip ss - -main = next (\x -> Skip x) (3 :: Integer) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions4.scl deleted file mode 100644 index fe07e4742..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions4.scl +++ /dev/null @@ -1,8 +0,0 @@ - -first p = x - where - (x,y) = p - -main = first (3 :: Integer,4 :: Integer) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions5.scl deleted file mode 100644 index 97cf72c2f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/LocalDefinitions5.scl +++ /dev/null @@ -1,13 +0,0 @@ -import "Prelude" - -data Foo = Foo Double Double - -a = Foo 1 2 - -b = y - where - Foo x y = a - -main = show b --- -2.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros1.scl deleted file mode 100644 index 37b4e053e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros1.scl +++ /dev/null @@ -1,8 +0,0 @@ -@macro -(||) :: Boolean -> Boolean -> Boolean -a || b = if a then True else b - -main :: Boolean -main = True || (fail "This should not be executed") --- -true \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros2.scl deleted file mode 100644 index d1379cd8e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros2.scl +++ /dev/null @@ -1,13 +0,0 @@ -import "JavaBuiltin" as Java - -(==) = Java.icmpeq - -@macro -(&<&) :: Integer -> Integer -> Integer -a &<& b = if cmp == 0 then b else cmp - where - cmp = a - -main = 3 &<& 7 --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros3.scl deleted file mode 100644 index ec1571dc0..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros3.scl +++ /dev/null @@ -1,16 +0,0 @@ -import "JavaBuiltin" as Java - -@JavaType "java.util.Collection" -data Collection a - -@macro -collectionToList :: Collection a -> [a] -collectionToList = Java.unsafeCoerce - -singleton :: a -> Collection a -singleton = Java.staticMethod "java.util.Collections.singletonList" - -main :: [Integer] -main = collectionToList (singleton 15) --- -[15] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros4.scl deleted file mode 100644 index 87e41e0af..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Macros4.scl +++ /dev/null @@ -1,12 +0,0 @@ -@macro -@inline -($) :: (a -> b) -> a -> b -f $ x = f x - -justExecute :: (() -> a) -> a -justExecute f = f () - -main :: Integer -main = justExecute $ \() -> (13 :: Integer) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Map1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Map1.scl deleted file mode 100644 index 5d9f38c99..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Map1.scl +++ /dev/null @@ -1,18 +0,0 @@ -data List a = Nil | Cons a (List a) - -map f Nil = Nil -map f (Cons h t) = Cons (f h) (map f t) - -map2 f l = run l - where - run Nil = Nil - run (Cons h t) = Cons (f h) (run t) - -map3 f l = run l - where - run Nil = Nil - run (Cons h t) = Cons (f h) (map f t) - -main = "Foo" --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MarketModel.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MarketModel.scl deleted file mode 100644 index da27b041d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MarketModel.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -l :: [Integer] -l = [2,3] - -f :: Integer -> [Integer] -f n = [n] + [0 | i <- l] - -main = f 1 --- -[1, 0, 0] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MarketModel2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MarketModel2.scl deleted file mode 100644 index bcd576bb1..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MarketModel2.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "IterN" -import "Random" - -foo :: Integer -> Double -foo n = runRandom $ foldlN addRandom 0.0 n - -addRandom :: Double -> Integer -> Double -addRandom v i = v + randomDouble - -main = "Foo" --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching.scl deleted file mode 100644 index f240a1c2b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching.scl +++ /dev/null @@ -1,19 +0,0 @@ - -data List a = Nil | Cons a (List a) - -first :: List Integer -> Integer -//first Nil = 0 :: Integer -first (Cons x _) = x - -reverse :: List a -> List a -reverse l = reverseAux Nil l - where - reverseAux accum Nil = accum - reverseAux accum (Cons h t) = reverseAux (Cons h accum) t - -main :: Integer -main = first (reverse l) - where - l = Cons (1 :: Integer) (Cons (2 :: Integer) (Cons (3 :: Integer) Nil)) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching2.scl deleted file mode 100644 index c71b98bf8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching2.scl +++ /dev/null @@ -1,9 +0,0 @@ - -main = match (5 :: Integer) with - (1 :: Integer) -> "wrong" - (2 :: Integer) -> "wrong" - (5 :: Integer) -> "right" - (6 :: Integer) -> "wrong" - _ -> "wrong" --- -right \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching3.scl deleted file mode 100644 index 904a84397..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching3.scl +++ /dev/null @@ -1,10 +0,0 @@ - -a = 5 :: Long -main = match a with - 1 -> "wrong" - 2 -> "wrong" - 5 -> "right" - 6 -> "wrong" - _ -> "wrong" --- -right \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching3b.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching3b.scl deleted file mode 100644 index 486434583..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching3b.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "StandardLibrary" - -foo 1 = "one" -foo 2 = "two" - -main = if True then foo (2 :: Long) else foo (1 :: Integer) --- -two \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching4.scl deleted file mode 100644 index 8c8812b50..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching4.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -dummySum [] = 0 -dummySum [a] = a -dummySum [a,b] = a + b -dummySum [a,b,c] = a + b + c -dummySum l = sum l - -main = dummySum [] + dummySum [1] + dummySum [1,2] + dummySum [1,2,3] --- -10 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching5.scl deleted file mode 100644 index 61723e8f8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Matching5.scl +++ /dev/null @@ -1,5 +0,0 @@ -main = do - match () with - () -> "Hello" --- -Hello \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MatchingWithMissingParameter.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MatchingWithMissingParameter.scl deleted file mode 100644 index 33a681fd3..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MatchingWithMissingParameter.scl +++ /dev/null @@ -1,10 +0,0 @@ -data Foo = Foo Integer Integer - | Bar - -isFoo (Foo _) = True -isFoo _ = False - -main = "Hello world!" --- -4:7-4:14: The function is applied with too few parameters. - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MatchingWithoutTypeAnnotations.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MatchingWithoutTypeAnnotations.scl deleted file mode 100644 index 80d147773..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MatchingWithoutTypeAnnotations.scl +++ /dev/null @@ -1,10 +0,0 @@ - -data List a = Nil | Cons a (List a) - -//first :: List Integer -> Integer -first Nil = 0 :: Integer -first (Cons x _) = x - -main = first (Cons (9 :: Integer) (Cons (8 :: Integer) Nil)) --- -9 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MaximumBy.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MaximumBy.scl deleted file mode 100644 index c70c9dae8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MaximumBy.scl +++ /dev/null @@ -1,10 +0,0 @@ -import "Prelude" hiding (maximumBy) - -maximumBy :: Ord b => (a -> b) -> [a] -> a -maximumBy f = snd . foldl1 maxF . map (\x -> (f x, x)) - where - maxF (a @ (aV,_)) (b @ (bV,_)) = if aV >= bV then a else b - -main = maximumBy (`mod` 10) [1::Integer, 14, 23, 9, 14, 67] --- -9 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe1.scl deleted file mode 100644 index 98a7d71ae..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe1.scl +++ /dev/null @@ -1,6 +0,0 @@ -a = Nothing -main = match a with - Nothing -> "Correct" - Just x -> "Incorrect" --- -Correct \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe2.scl deleted file mode 100644 index 0bc50fb5e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe2.scl +++ /dev/null @@ -1,6 +0,0 @@ -a = Just True -main = match a with - Nothing -> False - Just x -> x --- -true \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe3.scl deleted file mode 100644 index 8a0f12070..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe3.scl +++ /dev/null @@ -1,6 +0,0 @@ -a = Just "ABC" -main = match a with - Nothing -> "Incorrect" - Just x -> x --- -ABC \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe4.scl deleted file mode 100644 index 53e3ed3d7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Maybe4.scl +++ /dev/null @@ -1,18 +0,0 @@ -import "Prelude" hiding (fromMaybe) -import "Random" - -importJava "org.simantics.scl.compiler.tests.imports.Maybe4Imports" where - toMaybeDouble :: String -> Maybe a - -fromMaybe :: a -> Maybe a -> a -fromMaybe _ (Just v) = v -fromMaybe def _ = def - -f x = do - a = fromMaybe (-1.0) (toMaybeDouble x) - b = fromMaybe (-1.0) (toMaybeDouble ("1" + x)) - a+b - -main = withSeed 123 (f "2.0") --- -14.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingEffect.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingEffect.scl deleted file mode 100644 index 9a5ea98c4..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingEffect.scl +++ /dev/null @@ -1,15 +0,0 @@ -import "Prelude" hiding (findFirst) - -findFirst :: (a -> Maybe b) -> [a] -> Maybe b -findFirst f l = loop 0 - where - len = length l - loop i - | i >= len = Nothing - | otherwise = match f (l!i) with - s @ (Just _) -> s - Nothing -> loop (i+1) - -main = "Not to be executed" --- -9:29-9:36: Side-effect a is forbidden here. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingMethod.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingMethod.scl deleted file mode 100644 index d5b1b27f8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingMethod.scl +++ /dev/null @@ -1,12 +0,0 @@ -class FooBar a where - foo :: a -> a - bar :: a -> a - -instance FooBar Integer where - foo x = x - -main = "Not to be executed." --- -5:1-6:14: Method bar is not defined. - - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingTypeParameter.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingTypeParameter.scl deleted file mode 100644 index fc40ab9cd..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MissingTypeParameter.scl +++ /dev/null @@ -1,6 +0,0 @@ -importJava "java.util.Arrays" where - toString :: MVector /*Double*/ -> String - -main = "Not to be executed." --- -??? \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ModuleInitialization.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ModuleInitialization.scl deleted file mode 100644 index bd3dfa10b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ModuleInitialization.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -d = map (+1) c -a = [1,2,3] -c = map (+1) b -b = map (+1) a -e = map (+1) d - -main = e --- -[5, 6, 7] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadBug1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadBug1.scl deleted file mode 100644 index 44ddf00e6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadBug1.scl +++ /dev/null @@ -1,10 +0,0 @@ -class Monad m where - (>>=) :: m a -> (a -> m b) -> m b - -@macro -(>>) :: Monad m => m a -> m b -> m b -ma >> mb = ma >>= (\_ -> mb) - -main = "OK" --- -OK \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadSyntax1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadSyntax1.scl deleted file mode 100644 index 94774a4f2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadSyntax1.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -a = [1, 2] -b = [5, 6] - -main = mdo - x <- a - y <- b - return (x+y) --- -[6, 7, 7, 8] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadSyntax2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadSyntax2.scl deleted file mode 100644 index 6244a6162..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/MonadSyntax2.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" - -a = [1, 2] -b = [5, 6] - -main = do - x <- a - y <- b - return (x+y) --- -7:3-7:9: Bind statements are allowed only in mdo-blocks. -8:3-8:9: Bind statements are allowed only in mdo-blocks. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Monads1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Monads1.scl deleted file mode 100644 index 90115d3ff..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Monads1.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -a = [1, 2] -b = [5, 6] - -main = a >>= \x -> b >>= \y -> return (x+y) --- -[6, 7, 7, 8] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoDefinitionErrorMessage.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoDefinitionErrorMessage.scl deleted file mode 100644 index 8597a78ac..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoDefinitionErrorMessage.scl +++ /dev/null @@ -1,7 +0,0 @@ -// Idea of this test is that the missing definition should only cause -// one error message pointing to the type declaration. -a :: Double -b :: Double -b = a --- -3:1-3:12: a is not defined. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoInstance.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoInstance.scl deleted file mode 100644 index 4bc5cabba..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoInstance.scl +++ /dev/null @@ -1,9 +0,0 @@ - -class Foo a where - foo :: a - -x :: Double -x = foo - --- -6:5-6:8: Constraint is not given and cannot be derived. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoInstance2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoInstance2.scl deleted file mode 100644 index 9490a822d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NoInstance2.scl +++ /dev/null @@ -1,10 +0,0 @@ - -class Foo a where - foo :: a - -y :: Double -y = y - -x = if True then foo else y --- -8:18-8:21: There is no instance for . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonassociativeOperator.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonassociativeOperator.scl deleted file mode 100644 index f2b473ae9..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonassociativeOperator.scl +++ /dev/null @@ -1,7 +0,0 @@ -infix 3 (+) - -a + b = a - -threeTimes x = x + x + x --- -5:22-5:23: Operator + is not associative. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonexistentTypeClassInAnnotation.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonexistentTypeClassInAnnotation.scl deleted file mode 100644 index 40306395a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonexistentTypeClassInAnnotation.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -deepId :: FooBar b => b -> a -> a -deepId count x = deepId2 count x -deepId2 count x = if count <= 0 then x else deepId (count-1) x - -main = deepId (5 :: Integer) "FOO" --- -3:11-3:17: Unresolved type class FooBar. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonexistingEffect.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonexistingEffect.scl deleted file mode 100644 index 8ed51f912..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/NonexistingEffect.scl +++ /dev/null @@ -1,6 +0,0 @@ -importJava "java.lang.System" where - nanoTime :: () -> Long - -main = nanoTime () --- -2:24-2:28: Didn't find effect constructor Pred. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OneLineMatch.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OneLineMatch.scl deleted file mode 100644 index 3f16b0783..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OneLineMatch.scl +++ /dev/null @@ -1,6 +0,0 @@ -// Tests that match cases can be given in the same line as the scrutinee -data FooBar a = Foo a | Bar a -extract x = match x with Foo v -> v ; Bar v -> v -main = extract (Foo (3 :: Integer)) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OpenString1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OpenString1.scl deleted file mode 100644 index e8a7c4c76..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OpenString1.scl +++ /dev/null @@ -1,3 +0,0 @@ -"asd --- -1:1-1:6: Unclosed string literal. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OpenString2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OpenString2.scl deleted file mode 100644 index 31953cc01..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OpenString2.scl +++ /dev/null @@ -1,6 +0,0 @@ -"asd - - -asd --- -1:1-1:6: Unclosed string literal. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic1.scl deleted file mode 100644 index de083e814..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic1.scl +++ /dev/null @@ -1,17 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 6 (+) - -class Additive a where - (+) :: a -> a -> a - -instance Additive Double where - x + y = Java.dadd x y - -instance Additive Integer where - x + y = Java.iadd x y - -main = ((1.0 :: Double)+(2.0 :: Double),(3::Integer)+(4::Integer)) --- -(3.0,7) - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic2.scl deleted file mode 100644 index 1619f585d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic2.scl +++ /dev/null @@ -1,20 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 6 (+) - -class Additive a where - (+) :: a -> a -> a - -instance Additive Double where - x + y = Java.dadd x y - -instance Additive Integer where - x + y = Java.iadd x y - -instance (Additive a, Additive b) => Additive (a,b) where - (x1,y1) + (x2,y2) = (x1+x2,y1+y2) - -main = (1.0::Double,3::Integer) + (2.0::Double,4::Integer) --- -(3.0,7) - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic3.scl deleted file mode 100644 index 230e486cf..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedArithmetic3.scl +++ /dev/null @@ -1,27 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 7 (*) -infixl 6 (+) - -class Additive a where - (+) :: a -> a -> a - -class (Additive a) => Ring a where - (*) :: a -> a -> a - -instance Additive Double where - x + y = Java.dadd x y - -instance Ring Double where - x * y = Java.dmul x y - -instance Additive Integer where - x + y = Java.iadd x y - -instance Ring Integer where - x * y = Java.imul x y - -main = (1.0 :: Double)*(2.0 :: Double)+(3.0 :: Double)*(4.0 :: Double) --- -14.0 - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedLiterals2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedLiterals2.scl deleted file mode 100644 index c1670972a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/OverloadedLiterals2.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -inc :: Ring a => a -> a -inc x = x + 1 - -main :: Double -main = inc 34 --- -35.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading1.scl deleted file mode 100644 index dfb607934..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading1.scl +++ /dev/null @@ -1,19 +0,0 @@ -// module Foo1 -import "Prelude" - -foo :: Integer -> Boolean -foo i = i == 5 --- -// module Foo2 -import "Prelude" - -foo :: Integer -> Integer -> Boolean -foo i j = i == j --- -import "Prelude" -import "Foo1" -import "Foo2" - -main = foo 5 && foo 5 4 --- -false \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading2.scl deleted file mode 100644 index e7a28de00..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading2.scl +++ /dev/null @@ -1,20 +0,0 @@ -// module Max1 -import "Prelude" - -myMax :: Ord a => a -> a -> a -myMax = max --- -// module Max2 -import "Prelude" - -myMax :: Ord a => a -> a -> a -> a -myMax a b c = max a (max b c) --- -import "Prelude" -import "Max1" -import "Max2" - -main = myMax (1 :: Integer) 2 3 + myMax (3 :: Integer) 2 1 + myMax 4 2 :: Integer --- -10 - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading3.scl deleted file mode 100644 index 9385ce7bc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Overloading3.scl +++ /dev/null @@ -1,23 +0,0 @@ -// module M1 -import "Prelude" - -foo :: Ring a => Boolean -> a -> a -foo True v = v+1 -foo False v = v+1 --- -// module M2 -import "Prelude" - -foo :: Ring a => String -> a -> a -foo cond v = if cond=="true" - then v+1 - else v-1 --- -import "Prelude" -import "M1" -import "M2" - -main = foo False (foo "True" 10) :: Integer --- -10 - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Parsing.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Parsing.scl deleted file mode 100644 index 0ca342a34..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Parsing.scl +++ /dev/null @@ -1,62 +0,0 @@ -import "Prelude" - -""" -Parser is a function from a string and a position in the -string to a possible semantics of a substring and the -end of the substring. -""" -data Parser a = Parser (String -> Integer -> Maybe (a, Integer)) - -runParser :: Parser a -> String -> Integer -> Maybe (a, Integer) -runParser (Parser f) = f - -instance Functor Parser where - fmap f (Parser p) = Parser (\input pos -> match p input pos with - Nothing -> Nothing - Just (a, newPos) -> Just (f a, newPos) - ) - -instance Monad Parser where - return x = Parser (\_ pos -> Just (x, pos)) - (pa >>= f) = Parser (\input pos -> match runParser pa input pos with - Nothing -> Nothing - Just (a, newPos) -> runParser (f a) input newPos - ) - -(|||) :: Parser a -> Parser a -> Parser a -Parser a ||| Parser b = Parser (\input pos -> match a input pos with - Nothing -> b input pos - Just x -> Just x -) - -keyword :: String -> Parser () -keyword word = Parser (\input pos -> - if regionMatches word 0 input pos (length word) - then Just ((), pos + (length word)) - else Nothing -) - -data List a = Nil | Cons a (List a) - -listSepL :: Parser () -> Parser a -> Parser (List a) -listSepL sep el = mdo - head <- el - tail <- (sep >> listSepL sep el) ||| return Nil - return (Cons head tail) - -fromList :: List a -> [a] -fromList = unfoldr gen - where - gen Nil = Nothing - gen (Cons h t) = Just (h, t) - -listSep :: Parser () -> Parser a -> Parser [a] -listSep sep el = fmap fromList (listSepL sep el) - -aOrB = (keyword "a" >> return "a") ||| (keyword "b" >> return "b") - -myParser = listSep (keyword ",") aOrB - -main = show (runParser myParser "a,b,b,a" 0) --- -Just (["a", "b", "b", "a"], 7) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PatternError.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PatternError.scl deleted file mode 100644 index ce417affc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PatternError.scl +++ /dev/null @@ -1,22 +0,0 @@ -import "Prelude" - -data CP = CP Integer String - -//cpName :: CP -> String -cpName CP cp name = name - -connectionPoints :: Integer -> [(CP, CP)] -connectionPoints n = [] - -hasTerminalProblems :: Integer -> Boolean -hasTerminalProblems uc = - let cps = connectionPoints uc - cpCount = length cps - dcps = map snd cps - dnames = map cpName dcps - dcpNameCount = length $ unique $ sort dnames - in cpCount != dcpNameCount - -main = "Not OK" --- -6:8-6:10: ??? \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PolymorphicRecursion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PolymorphicRecursion.scl deleted file mode 100644 index ed84193b7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PolymorphicRecursion.scl +++ /dev/null @@ -1,16 +0,0 @@ -// Idea here is to test the following property: -// When a function is called recursively it has locally a monomorphic type. -// Therefore the definition of cons does not work even if it works -// with a proper type annotation. - -data Vec a = Nil | Zero (Vec (a,a)) | One a (Vec (a,a)) - -// cons :: a -> Vec a -> Vec a -cons x Nil = One x Nil -cons x (Zero ps) = One x ps -cons x (One y ps) = Zero (cons (x, y) ps) --- -11:21-11:42: Expected got . -11:33-11:34: Type (a, a) is not a subtype of a. -11:36-11:37: Type (a, a) is not a subtype of a. -11:39-11:41: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PolymorphicRecursion2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PolymorphicRecursion2.scl deleted file mode 100644 index 44738e055..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PolymorphicRecursion2.scl +++ /dev/null @@ -1,12 +0,0 @@ - - -class Foo a where - foo :: a - -data List a = Nil | Cons a (List a) - -r x = Cons foo (r x) - -main = (1.0 :: Double) --- -1.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Polynomials.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Polynomials.scl deleted file mode 100644 index 5e35b9424..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Polynomials.scl +++ /dev/null @@ -1,50 +0,0 @@ -import "Prelude" - -data Poly a = Poly [a] - -normalize l = go (length l) - where - go i = if i > 0 && l!(i-1)==zero - then go (i-1) - else take i l - -instance (Eq a, Additive a) => Additive (Poly a) where - zero = Poly [] - Poly a + Poly b = - Poly ( - normalize ( - zipWith (+) a b + - if la > lb - then drop lb a - else drop la b - ) - ) - where - la = length a - lb = length b - -instance (Eq a, Ring a) => Ring (Poly a) where - one = Poly [one] - neg (Poly l) = Poly (map neg l) - a - b = a + (neg b) - Poly a * Poly b = - Poly ( if aDeg < bDeg - then [ segSum n 0 n | n <- [0 ..aDeg] ] - + [ segSum n 0 aDeg | n <- [aDeg+1..bDeg] ] - + [ segSum n (n-bDeg) aDeg | n <- [bDeg+1..sumDeg] ] - else [ segSum n 0 n | n <- [0 ..bDeg] ] - + [ segSum n (n-bDeg) n | n <- [bDeg+1..aDeg] ] - + [ segSum n (n-bDeg) aDeg | n <- [aDeg+1..sumDeg] ] - ) - where - aDeg = length a - 1 - bDeg = length b - 1 - sumDeg = aDeg + bDeg - segSum n low high = sum [ a!i * b!(n-i) | i <- [low..high] ] - fromInteger x = Poly [fromInteger x] - -a = Poly [4.0,5.0,8.0,3.0,2.0,1.0] -b = Poly [1.0,0.0,2.0,1.0] -main = a * a + a * b + b * a + b * b - (a+b)*(a+b) --- -[] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PrecedenceOfNonoperators.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PrecedenceOfNonoperators.scl deleted file mode 100644 index 3321e8958..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/PrecedenceOfNonoperators.scl +++ /dev/null @@ -1,9 +0,0 @@ -infixr 2 l -infixr 1 r - -l a b = a -r a b = b - -main = (1 :: Integer) `l` (2 :: Integer) `r` (3 :: Integer) `l` (4 :: Integer) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Primes.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Primes.scl deleted file mode 100644 index 830186ba7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Primes.scl +++ /dev/null @@ -1,24 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 7 (%) -infixl 6 (+) -infix 4 (==), (<) - -(+) = Java.iadd -(%) = Java.irem -(<) = Java.icmplt -(==) = Java.icmpeq - -isPrime p = isPrimeAux (2 :: Integer) p - where - isPrimeAux d p = if d == p then True - else if p % d == 0 then False - else isPrimeAux (d+1) p - -nextPrime p = if isPrime p - then p - else nextPrime (p+(1 :: Integer)) - -main = nextPrime 32 --- -37 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc1.scl deleted file mode 100644 index b91eed34f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc1.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -main = do - r = ref 13 - r := 14 - getRef r --- -14 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc2.scl deleted file mode 100644 index bd8021b13..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc2.scl +++ /dev/null @@ -1,29 +0,0 @@ -import "Prelude" - -data RealWorld = RealWorld -data IO a = IO (RealWorld -> (RealWorld, a)) - -@inline -unIO (IO m) = m - -instance Functor IO where - @inline - fmap f x = x >>= (return . f) - -instance Monad IO where - @inline - return x = IO (\s -> (s, x)) - - @inline - (IO m) >>= f = IO (\s -> do - (newS, v) = m s - unIO (f v) newS - ) - -@inline -runIO :: IO a -> a -runIO m = snd (unIO m RealWorld) - -main = runIO (return (13 :: Integer)) --- -13 diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc3.scl deleted file mode 100644 index 4a17fe480..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Proc3.scl +++ /dev/null @@ -1,16 +0,0 @@ -import "Prelude" - -@private -repeat :: Integer -> (() -> a) -> () -repeat n proc = - if n > 0 then do - proc () - repeat (n-1) proc - else () - -main = do - a = ref 1 - repeat 3 (\() -> a := 2) - getRef a --- -2 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Pythagoras.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Pythagoras.scl deleted file mode 100644 index 95a5b9b78..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Pythagoras.scl +++ /dev/null @@ -1,24 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 7 (*) -infixl 6 (+) - -(+) :: Double -> Double -> Double -(+) = Java.dadd -(*) :: Double -> Double -> Double -(*) = Java.dmul - -importJava "java.lang.Math" where - sqrt :: Double -> Double - sin :: Double -> Double - cos :: Double -> Double - -square x = x * x - -length x y = sqrt (square x + square y) - -pythagoras a = length (cos a) (sin a) - -main = pythagoras 2.0 --- -1.0 diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Random1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Random1.scl deleted file mode 100644 index 66922eadb..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Random1.scl +++ /dev/null @@ -1,19 +0,0 @@ -import "StandardLibrary" - -// Actual program - -"""This function returns either 0 or 1 such that -the expected value is pi/4""" -approximatePi :: () -> Double -approximatePi () = if x*x + y*y < 1 then 1 else 0 - where - x = randomDouble - y = randomDouble - -averageOfNRepeats n f = sum [f () | n <- [1..n]] / fromInteger n - -betterApproximatePi () = averageOfNRepeats 1000 approximatePi * 4 - -main = withSeed 13 (betterApproximatePi ()) --- -3.068 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RangeSyntax.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RangeSyntax.scl deleted file mode 100644 index 662255248..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RangeSyntax.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = [5..9] --- -[5, 6, 7, 8, 9] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Record1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Record1.scl deleted file mode 100644 index fcfbf6a25..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Record1.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -data XYS = XYS { x :: Double, y :: Double, s :: String } - -len XYS {x = x, y = y} = sqrt (x*x + y*y) - -main = len (XYS { x = 4, y = 3, s = "Hello world!" }) --- -5.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecordShorthand.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecordShorthand.scl deleted file mode 100644 index d3af73e02..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecordShorthand.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -data Vec = Vec { x :: Double, y :: Double } -deriving instance Show Vec - -createVec x y = Vec {x, y} -sumVec Vec { x1, y1 } Vec { x2, y2 } = Vec { x = x1+x2, y = y1 + y2 } - -main = sumVec (createVec 1 2) (createVec 3 4) --- -(Vec 4.0 6.0) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveContext.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveContext.scl deleted file mode 100644 index 741286211..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveContext.scl +++ /dev/null @@ -1,23 +0,0 @@ -import "JavaBuiltin" as Java - -infixl 6 (+), (-) - -class Num a where - (+) :: a -> a -> a - (-) :: a -> a -> a - isZero :: a -> Boolean - one :: a - -instance Num Integer where - x + y = Java.iadd x y - x - y = Java.isub x y - isZero x = Java.icmpeq Java.iconst_0 x - one = Java.iconst_1 - -even x = if isZero x then True else odd (x - one) -odd x = if isZero x then False else even (x - one) - -main = odd (8 :: Integer) --- -false - diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues.scl deleted file mode 100644 index 554852045..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues.scl +++ /dev/null @@ -1,6 +0,0 @@ -a = b -b = a - -main = a --- -???: Variables defined recursively must all be functions. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl deleted file mode 100644 index 7291bb990..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl +++ /dev/null @@ -1,5 +0,0 @@ -f g = a - where - a = g a --- -3:11-3:12: Couldn't resolve variable a. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues3.scl deleted file mode 100644 index 020a967d5..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues3.scl +++ /dev/null @@ -1,12 +0,0 @@ -data Nat = O | S Nat - -// It is important for this test that even and or are not annotated -even O = True -even (S x) = odd x - -odd O = False -odd (S x) = even x - -main = even (S (S (S (S (S O))))) --- -false \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues4.scl deleted file mode 100644 index 0315be34a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RecursiveValues4.scl +++ /dev/null @@ -1,5 +0,0 @@ -(foo, bar) = (foo, "Hello world!") - -main = "ERROR" --- -1:1-1:11: Illegal left hand side of the definition. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RedBlackTrees.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RedBlackTrees.scl deleted file mode 100644 index 6f47bd013..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RedBlackTrees.scl +++ /dev/null @@ -1,101 +0,0 @@ -import "Prelude" - -// Version 1, 'untyped' -data Color = R | B - -deriving instance Show Color - -data RB a = E | T Color (RB a) a (RB a) - -rbToList :: RB a -> [a] -rbToList E = [] -rbToList (T _ l a r) = rbToList l + [a] + rbToList r - -deriving instance (Show a) => Show (RB a) - -// Insertion and membership test as by Okasaki -insert :: Ord a => a -> RB a -> RB a -insert x s = (match ins s with T _ a z b -> T B a z b) - where - ins E = T R E x E - ins s = match s with - T B a y b -> - if xy - then balance a y (ins b) - else s - T R a y b -> - if xy - then T R a y (ins b) - else s - -member :: Ord a => a -> RB a -> Boolean -member x E = False -member x (T _ a y b) - | xy = member x b - | otherwise = True - -// balance: first equation is new, to make it work with a weaker invariant -balance :: RB a -> a -> RB a -> RB a -balance (T R a x b) y (T R c z d) = T R (T B a x b) y (T B c z d) -balance (T R (T R a x b) y c) z d = T R (T B a x b) y (T B c z d) -balance (T R a x (T R b y c)) z d = T R (T B a x b) y (T B c z d) -balance a x (T R b y (T R c z d)) = T R (T B a x b) y (T B c z d) -balance a x (T R (T R b y c) z d) = T R (T B a x b) y (T B c z d) -balance a x b = T B a x b - -// deletion a la SMK -delete :: Ord a => a -> RB a -> RB a -delete x t = (match del t with - T _ a y b -> T B a y b - _ -> E) - where - del E = E - del (T _ a y b) - | xy = delformRight a y b - | otherwise = app a b - delformLeft a y b= match a with - T B _ _ _ -> balleft (del a) y b - _ -> T R (del a) y b - delformRight a y b = match b with - T B _ _ _ -> balright a y (del b) - _ -> T R a y (del b) - -balleft :: RB a -> a -> RB a -> RB a -balleft (T R a x b) y c = T R (T B a x b) y c -balleft bl x (T B a y b) = balance bl x (T R a y b) -balleft bl x (T R (T B a y b) z c) = T R (T B bl x a) y (balance b z (sub1 c)) - -balright :: RB a -> a -> RB a -> RB a -balright a x (T R b y c) = T R a x (T B b y c) -balright (T B a x b) y bl = balance (T R a x b) y bl -balright (T R a x (T B b y c)) z bl = T R (balance (sub1 a) x b) y (T B c z bl) - -sub1 :: RB a -> RB a -sub1 (T B a x b) = T R a x b -sub1 _ = fail "invariance violation" - -app :: RB a -> RB a -> RB a -app E x = x -app x E = x -app (T R a x b) (T R c y d) = - match app b c with - T R b' z c' -> T R(T R a x b') z (T R c' y d) - bc -> T R a x (T R bc y d) -app (T B a x b) (T B c y d) = - match app b c with - T R b' z c' -> T R(T B a x b') z (T B c' y d) - bc -> balleft a x (T B bc y d) -app a (T R b x c) = T R (app a b) x c -app (T R a x b) c = T R a x (app b c) - -testList = [4,6,2,7,4,7,2,5] - -main = rbToList (foldl (flip insert) E testList) --- -[2, 4, 5, 6, 7] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Relations1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Relations1.scl deleted file mode 100644 index b15c1b861..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Relations1.scl +++ /dev/null @@ -1,18 +0,0 @@ -import "StandardLibrary" - -Concat ?x ?y ?z :- - @bbf 1 - ?z = ?x + ?y - - @bfb 0.5 - startsWith ?z ?x - ?y = drop (length ?x) ?z - - @fbb 0.5 - endsWith ?z ?y - ?x = take (length ?z - length ?y) ?z - -main = select ?y where - Concat "Hello " ?y "Hello world!" --- -[world!] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Relations2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Relations2.scl deleted file mode 100644 index 825685edc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Relations2.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "StandardLibrary" - -MyExecute ?procedure :- - @enforce - Execute (?procedure "Foo") - -main = do - v = ref "" - enforce MyExecute (v :=) - getRef v --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RepeatedVariableInPattern.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RepeatedVariableInPattern.scl deleted file mode 100644 index 8e5cf084c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/RepeatedVariableInPattern.scl +++ /dev/null @@ -1,6 +0,0 @@ -invalidProject :: (a,a) -> a -invalidProject (a,a) = a - -main = "Not to be executed!" --- -2:19-2:20: Repeated variable a in pattern. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SSATypingBug.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SSATypingBug.scl deleted file mode 100644 index 15ff01275..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SSATypingBug.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -test :: () -> [Integer] -test _ = do - header = [0] - rows = map (\foo -> map (\bar -> bar) [foo]) [1..5] - foldl (+) header rows - -main = test () --- -[0, 1, 2, 3, 4, 5] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Scanl.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Scanl.scl deleted file mode 100644 index 67821ddef..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Scanl.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "Prelude" hiding (scanl) - -scanl :: (b -> a -> b) -> b -> [a] -> [b] -scanl f initial l = build (loop initial 0) - where - len = length l - loop cur i accum cons = let nl = cons accum cur - in if i==len - then nl - else loop (f cur (l!i)) (i+1) nl cons - -main = scanl (+) 0 [1,2,3] --- -[0, 1, 3, 6] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Search.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Search.scl deleted file mode 100644 index 352e92c74..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Search.scl +++ /dev/null @@ -1,47 +0,0 @@ -import "Prelude" hiding (findFirst) - -infinity = 1e9 - -@inline -findFirst :: (a -> Maybe b) -> [a] -> Maybe b -findFirst f l = loop 0 - where - len = length l - loop i - | i >= len = Nothing - | otherwise = match f (l!i) with - s @ (Just _) -> s - Nothing -> loop (i+1) - -dfsFirst :: (a -> Boolean) -> (a -> [a]) -> [a] -> (Maybe a) -dfsFirst acceptable successors initial = tryAll initial - where - tryAll l = findFirst loop l - loop p - | acceptable p = Just p - | otherwise = tryAll (successors p) - -data Weighted a = Weighted a Double - -//type SearchAlgorithm e a = -// (a -> Boolean) -> (a -> [Weighted a]) -> [Weighted a] -> Weighted (Maybe a) - -//dfs :: SearchAlgorithm e a -dfs :: (a -> Boolean) -> (a -> [Weighted a]) -> [Weighted a] -> Weighted (Maybe a) -dfs acceptable successors initial = foldl loop (Weighted Nothing infinity) initial - where - loop best@(Weighted _ bestW) (Weighted p w) - | w >= bestW = best - | acceptable p = Weighted (Just p) w - | otherwise = foldl loop best - $ map (\(Weighted p' w') -> Weighted p' (w+w')) - $ successors p - -/* -bfs :: SearchAlgorithm e a - -aStar :: (a -> Double) -> SearchAlgorithm e a -*/ -main = "Hello" --- -Hello \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sections.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sections.scl deleted file mode 100644 index 2d7e57677..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sections.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = map (1/) $ map (*3) [1,2,3] --- -[0.3333333333333333, 0.16666666666666666, 0.1111111111111111] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select1.scl deleted file mode 100644 index f8d0359ec..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select1.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "StandardLibrary" - -main = let - l = [1..3] - in - select (?x,?y) where - ?x <- l - ?y <- l - ?x = ?y --- -[(1,1), (2,2), (3,3)] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select2.scl deleted file mode 100644 index a4928238c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select2.scl +++ /dev/null @@ -1,20 +0,0 @@ -import "StandardLibrary" -import "Minigraph" - -main = withGraph do - a = resource "a" - b = map resource ["b0", "b1", "b2", "b3", "b4"] - r = map resource ["r0", "r1"] - - enforce - Statement a (r!0) (b!0) - Statement a (r!0) (b!1) - Statement a (r!1) (b!4) - Statement a (r!1) (b!3) - Statement (b!1) (r!0) (b!2) - R a :- {} - R ?x :- R ?y ; Statement ?y (r!0) ?x - S ?x :- R ?x ; Statement ?x (r!0) _ - sort $ map uriOf $ select ?x where S ?x --- -[a, b1] diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select3.scl deleted file mode 100644 index a3e4f44e8..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select3.scl +++ /dev/null @@ -1,18 +0,0 @@ -import "StandardLibrary" -import "Minigraph" - -main = withGraph do - a = resource "a" - b = map resource ["b0", "b1", "b2", "b3", "b4"] - r = map resource ["r0", "r1"] - - enforce - Statement a (r!0) (b!0) - Statement a (r!0) (b!1) - Statement a (r!1) (b!4) - Statement (b!1) (r!1) (b!3) - Statement (b!1) (r!0) (b!2) - sort $ map uriOf $ select ?x where - Statement a (r!0) (_ : Resource { #r1 = ?x }) --- -[b3] diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select4.scl deleted file mode 100644 index 3199e9545..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select4.scl +++ /dev/null @@ -1,18 +0,0 @@ -import "StandardLibrary" -import "Minigraph" - -main = withGraph do - a = resource "a" - b = map resource ["b0", "b1", "b2"] - r = map resource ["r0", "r1"] - - enforce - Statement a (r!0) (b!0) - Statement a (r!0) (b!1) - Statement a (r!1) (b!1) - Statement a (r!1) (b!2) - sort $ map uriOf $ select ?x where - <|> Statement a (r!0) ?x - Statement a (r!1) ?x --- -[b0, b1, b1, b2] diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select5.scl deleted file mode 100644 index 18172473f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select5.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "StandardLibrary" -import "Minigraph" - -main = withGraph do - r = map resource ["r0", "r1"] - sort $ map uriOf $ select ?x where - Statement ?y (r!0) ?x - Statement ?x (r!1) ?y --- -6:24-8:30: Failed to compile the query. -Unsolved variables: ?x, ?y \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select6.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select6.scl deleted file mode 100644 index 84e4df30e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select6.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "StandardLibrary" - -main = select ?x where - (?x,?y) = (1,2) --- -[1] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select7.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select7.scl deleted file mode 100644 index b0be01ade..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select7.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "StandardLibrary" - -main = select ?x where - (?x, 3) <- [(1,2),(2,3),(3,4)] --- -[2] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select8.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select8.scl deleted file mode 100644 index 787704445..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select8.scl +++ /dev/null @@ -1,10 +0,0 @@ -import "StandardLibrary" - -Foo ?a ?b ?l :- - @ffb - (?a,?b) <- ?l - -main = select ?x where - Foo ?x 3 [(1,2),(2,3),(3,4)] --- -[2] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select9.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select9.scl deleted file mode 100644 index 56806793c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Select9.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "StandardLibrary" - -s1 = [1,2,3] -s2 = [1,3] - -main = do - C ?x :- - ?x <- s1 - ?x <- s2 - select ?x where C ?x --- -[2] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SelfReferringContextInTypeClass.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SelfReferringContextInTypeClass.scl deleted file mode 100644 index d2f1bd7a5..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SelfReferringContextInTypeClass.scl +++ /dev/null @@ -1,6 +0,0 @@ -class Ord a where - min :: Ord a => a -> a -> a - -main = "Not to be executed." --- -2:12-2:15: Unresolved type class Ord. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization.scl deleted file mode 100644 index e0d44e357..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "Prelude" - -rt :: Serializable a => a -> a -rt v = deserialize (serialize v) - -main :: String -main = show ( - (rt "Hello", rt ()), - (rt 1.2 :: Double, rt 1.2 :: Float, 3 :: Integer, 4 :: Long), - rt (Just (1 :: Integer)), - (rt [1::Integer,2,3], rt [[1::Integer,2],[3,4]], fromDoubleArray (rt (toDoubleArray [3::Double,2,1]))) - ) --- -(("Hello", ()), (1.2, 1.2, 3, 4), Just 1, ([1, 2, 3], [[1, 2], [3, 4]], [3.0, 2.0, 1.0])) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization2.scl deleted file mode 100644 index 8384527e7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization2.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "Prelude" -import "Serialization" - -rt :: IO a => a -> a -rt v = readByteArray (writeByteArray v) - -main = show ( - (rt "Hello", rt ()), - (rt 1.2 :: Double, rt 1.2 :: Float, 3 :: Integer, 4 :: Long), - rt (Just (1 :: Integer)), - (rt [1::Integer,2,3], rt [[1::Integer,2],[3,4]], fromDoubleArray (rt (toDoubleArray [3,2,1]))) - ) --- -(("Hello", ()), (1.2, 1.2, 3, 4), Just 1, ([1, 2, 3], [[1, 2], [3, 4]], [3.0, 2.0, 1.0])) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization3.scl deleted file mode 100644 index d883dfea7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Serialization3.scl +++ /dev/null @@ -1,22 +0,0 @@ -import "Prelude" -import "Serialization" as Serialization - -rt :: Serialization.IO a => a -> a -rt v = Serialization.readByteArray (Serialization.writeByteArray v) - -data FooBar a = Foo Integer | Bar a - -deriving instance (Show a) => Show (FooBar a) -deriving instance (Serialization.IO a) => Serialization.IO (FooBar a) - -/* -instance IO FooBar where - read s = match Serialization.read s :: Integer with - 0 -> Foo (Serialization.read s) - 1 -> Bar (Serialization.read s) - write s (Foo x) = do Serialization.write s (0 :: Integer) ; Serialization.write s x - write s (Bar x) = do Serialization.write s (1 :: Integer) ; Serialization.write s x -*/ -main = show (rt (Foo 3 :: FooBar Double)) --- -Foo 3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Set1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Set1.scl deleted file mode 100644 index b868ecf89..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Set1.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "StandardLibrary" - -s1 = Set.set [3,2,1,4] -s2 = Set.set [9,8,3,2] -s1s2 = Set.union s1 s2 - -main = show s1s2 --- -set [1, 2, 3, 4, 8, 9] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SharedTypeVariable.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SharedTypeVariable.scl deleted file mode 100644 index 19fd565e3..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SharedTypeVariable.scl +++ /dev/null @@ -1,8 +0,0 @@ -// Idea here is that the type variable in the top level type annotation -// and the type annotation in the expression should be the same type. -id :: a -> a -id x = (x :: a) - -main = id "OK" --- -OK \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ShortcutFusion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ShortcutFusion.scl deleted file mode 100644 index 6423ecbef..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ShortcutFusion.scl +++ /dev/null @@ -1,25 +0,0 @@ -data List a = Nil | Cons a (List a) - -@private -@inline -build :: (forall a. a -> (b -> a -> a) -> a) -> List b -build f = f Nil Cons - -@private -foldr :: (a -> b -> b) -> b -> List a -> b -foldr cons nil Nil = nil -foldr cons nil (Cons h t) = cons h (foldr cons nil t) - -@private -@inline -singleton :: a -> List a -singleton x = build (\nil cons -> cons x nil) - -@private -@inline -last :: List a -> a -> a -last l def = foldr (\x _ -> x) def l - -main = last (singleton "Hello") "Foo" --- -Hello \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Show1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Show1.scl deleted file mode 100644 index 649f3cbce..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Show1.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = show [(1,2),(3,4),(5,6)] --- -[(1, 2), (3, 4), (5, 6)] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Signals.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Signals.scl deleted file mode 100644 index 726a3f5be..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Signals.scl +++ /dev/null @@ -1,34 +0,0 @@ -import "Prelude" - -// --- Signals ------------------------------------------------------ - -data Signal = - SigSum [Signal] - | SigConst Double - | SigNeg Signal - | SigMul [Signal] - -deriving instance Eq Signal -deriving instance Hashable Signal -deriving instance Show Signal - -instance Additive Signal where - zero = SigConst 0 - a + b = SigSum [a,b] - sum l = SigSum l - -instance Ring Signal where - one = SigConst 1 - neg a = SigNeg a - fromInteger i = SigConst (fromInteger i) - a * b = SigMul [a,b] - -/* -instance Real Signal where - fromDouble d = SigConst d -*/ - -main :: Signal -main = 1 + 2 * 3 - 4 --- -??? \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SinConst1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SinConst1.scl deleted file mode 100644 index 66621b13b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SinConst1.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = (sin + const 1) 0 --- -1.0 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sort.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sort.scl deleted file mode 100644 index 7efdf8941..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sort.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" - -main :: [Integer] -main = sort [1,5,2,4,3] --- -[1, 2, 3, 4, 5] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sort2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sort2.scl deleted file mode 100644 index 8518264ec..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Sort2.scl +++ /dev/null @@ -1,19 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "org.simantics.scl.runtime.Lists" where - sortWith :: (a -> a -> Integer) -> [a] -> [a] - -//@JavaStaticMethod "org.simantics.scl.runtime.Lists.sortWith" -//sortWith :: (a -> a -> Integer) -> [a] -> [a] - - -//sortWith = Java.staticMethod "org.simantics.scl.runtime.Lists.sortWith" - -dumbCompare :: a -> a -> Integer -dumbCompare x y = 0 - -dumbSort = sortWith dumbCompare - -main = "Foo" --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SpecConstr1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SpecConstr1.scl deleted file mode 100644 index 4ff7d476f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SpecConstr1.scl +++ /dev/null @@ -1,25 +0,0 @@ -data Either a b = Left a | Right b - -data List a = Nil | Cons a (List a) - -data Nat = Zero | Succ Nat - -sum Zero a = a -sum a Zero = a -sum (Succ a) (Succ b) = Succ (Succ (sum a b)) - -sum_append xs ys - = go Zero (Left xs) - where - go z (Left xs) - = match xs with - Nil -> go z (Right ys) - Cons x xs' -> go (sum x z) (Left xs') - go z (Right ys) - = match ys with - Nil -> z - Cons y ys' -> go (sum y z) (Right ys') - -main = "Hello world!" --- -Hello world! \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StackTrace.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StackTrace.scl deleted file mode 100644 index fe30fa3af..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StackTrace.scl +++ /dev/null @@ -1,3 +0,0 @@ -main = fail "badly" --- -??? \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StreamFusion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StreamFusion.scl deleted file mode 100644 index 6d1864a22..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StreamFusion.scl +++ /dev/null @@ -1,139 +0,0 @@ -import "JavaBuiltin" as Java - -data Either a b = Left a | Right b - -data Stream a = Stream (s -> Step a s) s -data Step a s = Done | Yield a s | Skip s - -// stream :: [a] -> Stream a -// unstream :: Stream a -> [a] -// streamRev :: [a] -> Stream a -// unstreamRev :: Stream a -> [a] - -//toStream :: [a] -> Stream a -//toStream l = Stream (\i -> if i >= length l then Done else Yield (get l i) (i+1)) 0 - -filterS :: (a -> Boolean) -> Stream a -> Stream a -filterS p (Stream next0 s0) = Stream next s0 - where - next s = match next s with - Done -> Done - Skip s -> Skip s - Yield a s -> if p a then Yield a s else Skip s - -mapS :: (a -> b) -> Stream a -> Stream b -mapS f (Stream next0 s0) = Stream next s0 - where - next s = match next0 s with - Done -> Done - Skip s -> Skip s - Yield a s -> Yield (f a) s - -appendS :: Stream a -> Stream a -> Stream a -appendS (Stream next1 s1) (Stream next2 s2) = Stream next (Left s1) - where - next (Left s) = match next1 s with - Done -> Skip (Right s2) - Skip s -> Skip (Left s) - Yield a s -> Yield a (Left s) - next (Right s) = match next2 s with - Done -> Done - Skip s -> Skip (Right s) - Yield a s -> Yield a (Right s) - -decomposeS :: Stream a -> Maybe (a, Stream a) -decomposeS (Stream next s0) = loop s0 - where - loop s = match next s with - Done -> Nothing - Skip s -> loop s - Yield a s -> Just (a, Stream next s) - -returnS :: a -> Stream a -returnS x = Stream next True - where - next True = Yield x False - next False = Done - -isEmptyS :: Stream a -> Boolean -isEmptyS (Stream next s0) = loop s0 - where - loop s = match next s with - Done -> True - Skip s -> loop s - Yield _ _ -> False - -foldlS :: (a -> b -> a) -> a -> Stream b -> a -foldlS f init (Stream next s0) = go init s0 - where - go cur s = match next s with - Done -> cur - Skip s -> go cur s - Yield x s -> go (f cur x) s - -scanlS :: (a -> b -> a) -> a -> Stream b -> Stream a -scanlS f init (Stream next0 s0) = Stream next (s0, init) - where - next (s,v) = match next0 s with - Done -> Done - Skip s -> Skip (s, v) - Yield x s -> Yield v (s, f v x) - -concatMapS :: (a -> Stream b) -> Stream a -> Stream b -concatMapS f (Stream next0 s0) = Stream next (s0, Nothing) - where - next (s, Nothing) = match next0 s with - Done -> Done - Skip s -> Skip (s, Nothing) - Yield x s -> Skip (s, Just (f x)) - next (s0, Just (Stream next1 s1)) = match next1 s1 with - Done -> Skip (s0, Nothing) - Skip s -> Skip (s0, Just (Stream next1 s)) - Yield x s -> Yield x (s0, Just (Stream next1 s)) - -zipWithS :: (a -> b -> c) -> Stream a -> Stream b -> Stream c -zipWithS f (Stream next0 s0) (Stream next1 s1) = Stream next (s0, s1, Nothing) - where - next (s0, s1, Nothing) = match next0 s0 with - Done -> Done - Skip s -> Skip (s, s1, Nothing) - Yield x s -> Skip (s, s1, Just x) - next (s0, s1, Just x) = match next1 s1 with - Done -> Done - Skip s -> Skip (s0, s, Just x) - Yield y s -> Yield (f x y) (s0, s, Nothing) - -guardS :: Boolean -> Stream a -> Stream a -guardS b (Stream next0 s0) = Stream next (b, s0) - where - next (False, _) = Done - next (True, s) = match next0 s with - Done -> Done - Skip s -> Skip (True, s) - Yield x s -> Yield x (True, s) -/* -takeS :: Integer -> Stream a -> Stream a -takeS count (Stream next0 s0) = Stream next (count, s0) - where - next (count, s) = if count <= 0 then Done - else match next0 s with - Done -> Done - | Skip s -> Skip (count, s) - | Yield x s -> Yield x (count, s) -*/ -repeatS :: a -> Stream a -repeatS v = Stream next () - where - next () = Yield v () - -iterateS :: (a -> a) -> a -> Stream a -iterateS f v = Stream next v - where - next v = Yield v (f v) - -main :: Integer -main = foldlS Java.iadd (0 :: Integer) - (appendS (appendS (returnS (1 :: Integer)) - (returnS (2 :: Integer))) (returnS (3 :: Integer))) --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringEscape.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringEscape.scl deleted file mode 100644 index 51a75d3cb..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringEscape.scl +++ /dev/null @@ -1,12 +0,0 @@ -main = "a\nb\"c\'d" --- -a -b"c'd --- -main = "a\u0053" --- -aS --- -main = "a\xb" --- -1:8-1:10: Illegal string escape character. diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringInterpolation1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringInterpolation1.scl deleted file mode 100644 index eabad781a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringInterpolation1.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -f x = x + 1 - -g a b = """\(a) + \(b) = \(a+b)""" - -main = "f 3 = \(f 3), " + g 1 2 --- -f 3 = 4, 1 + 2 = 3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl deleted file mode 100644 index 9d219430b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl +++ /dev/null @@ -1,6 +0,0 @@ -stringSum :: String -> Integer -stringSum "(\(a),\(b),\(c))" = a + b + c - -main = stringSum "(1,2,3)" --- -6 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringMatching1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringMatching1.scl deleted file mode 100644 index 5865926af..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/StringMatching1.scl +++ /dev/null @@ -1,7 +0,0 @@ -main :: Integer -main = match "Bar" with - "Foo" -> 1 - "Bar" -> 2 - _ -> 3 --- -2 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SumOfInverses2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SumOfInverses2.scl deleted file mode 100644 index d3cacbae2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/SumOfInverses2.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "Prelude" - -f :: Integer -> Double -f m = sum [1/(fromInteger x) | x <- [1..m]] - -main = f 100 --- -5.187377517639621 diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Timing.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Timing.scl deleted file mode 100644 index deb6d507c..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Timing.scl +++ /dev/null @@ -1,10 +0,0 @@ -import "StandardLibrary" - -main = do - (r,t) = Debug.time (foldl (+) 0 - $ map (\(_,_,z) -> z) - $ [(a,b,c) | a <- [1..50], b <- [1..50], c <- [1..50], a*a + b*b == c*c]) - print t - r --- -1172 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TooManyParametersToSin.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TooManyParametersToSin.scl deleted file mode 100644 index bfaf3db56..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TooManyParametersToSin.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" - -main = sin 1 2 --- -3:8-3:11: Constrain Real (a -> b) contains free variables not mentioned in the type of the value. -3:14-3:15: Constrain Ring a contains free variables not mentioned in the type of the value. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation1.scl deleted file mode 100644 index 144b03155..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation1.scl +++ /dev/null @@ -1,59 +0,0 @@ -import "StandardLibrary" -import "Minigraph" -import "MMap" as MMap - -consistsOf :: Integer -consistsOf = resource "consistsOf" -instanceOf :: Integer -instanceOf = resource "instanceOf" -areConnected :: Integer -areConnected = resource "areConnected" -from :: Integer -from = resource "from" -to :: Integer -to = resource "to" - -element :: Integer -element = resource "Element" -connection :: Integer -connection = resource "Connection" - -mapping relation MapDiagrams Integer Integer - -rule ElementsRule where - @when - MapDiagrams ?dA ?dB - - @from - Statement ?dA consistsOf ?elA - Statement ?elA instanceOf element - - @to - Statement ?dB consistsOf ?elB - Statement ?elB instanceOf element - - @where - MapElements ?elA ?elB - -rule ConnectionsRule where - @when - MapElements ?elA1 ?elB1 - MapElements ?elA2 ?elB2 - - @from - Statement ?elA1 areConnected ?elA2 - - @to - Statement ?conn instanceOf connection - Statement ?conn from ?elB1 - Statement ?conn to ?elB2 - -foo :: () -foo = transformation OneShotForward where - MapDiagrams 0 0 - -main = withGraph do - foo - "OK" --- -OK diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation2.scl deleted file mode 100644 index dbb1609a9..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation2.scl +++ /dev/null @@ -1,25 +0,0 @@ -import "StandardLibrary" - -mapping relation Fib Integer Integer - -rule FibRecurrence where - @when - Fib ?n ?a - Fib (?n+1) ?b - ?n < 20 - - @where - Fib (?n+2) (?a + 1) -/* -rule PrintIt where - @when - Fib ?n ?a - - @to - Execute (print "\(?n) -> \(?a)") -*/ -main = transformation OneShotForward where - Fib 0 1 - Fib 1 1 --- -() diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation3.scl deleted file mode 100644 index f9b995cee..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation3.scl +++ /dev/null @@ -1,32 +0,0 @@ -import "StandardLibrary" - -mapping relation Fib Integer Integer - -rule FibRecurrence where - @when - Fib ?n (?a + ?b) - ?n >= 2 - - @where - Fib (?n-1) ?b - Fib (?n-2) ?a - -rule Init where - @when - Fib ?x 1 - ?x < 2 - -rule Seed where - @where - Fib 20 ?hmm - -rule PrintIt where - @when - Fib ?n ?a - - @to - Execute (print "\(?n) -> \(?a)") - -main = transformation OneShotForward where --- -() diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation4.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation4.scl deleted file mode 100644 index 5a889e1e0..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation4.scl +++ /dev/null @@ -1,27 +0,0 @@ -import "StandardLibrary" - -mapping relation M Integer (Integer,Integer) - -rule Mix where - @when - M ?a (?b, ?c) - ?a <= 10 - - @where - M (?a + 1) (?c, ?b) - -rule PrintIt where - @when - M ?a (?b,?c) - - @to - Execute (print "\(?a) -> \(?b), \(?c)") - -rule Seed where - @where - M 0 (1,?x) - M 10 (?y,2) - -main = transformation OneShotForward where --- -() diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation5.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation5.scl deleted file mode 100644 index e041430ee..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation5.scl +++ /dev/null @@ -1,22 +0,0 @@ -import "StandardLibrary" - -Foo ?x :- - @enforce 1 - Execute (?x := (1 :: Integer)) - -Bar ?x :- - @enforce 2 - Execute (if getRef ?x == 1 then () else fail "Test failed.") - -rule DoIt where - @from - ?x = ref (0 :: Integer) - - @to - Bar ?x - Foo ?x - -main :: () -main = transformation OneShotForward where --- -() diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation6.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation6.scl deleted file mode 100644 index 74aed46dc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation6.scl +++ /dev/null @@ -1,15 +0,0 @@ -import "StandardLibrary" - -mapping relation Foo String String - -rule DoIt where - @when - Foo ?a ?b - - @to - Foo ?b "c" - -main = transformation OneShotForward where - Foo "a" "b" --- -10:9-10:11: Cannot resolve the variable ?b using the source patterns. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation7.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation7.scl deleted file mode 100644 index cce48f6ed..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Transformation7.scl +++ /dev/null @@ -1,14 +0,0 @@ -import "StandardLibrary" - -Foo ?x :- - @enforce - Execute (iterList printString [?x :: String]) - - -rule DoIt where - @to - Foo "Hello world!" - -main = transformation OneShotForward where --- -() diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TransformationOrder.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TransformationOrder.scl deleted file mode 100644 index 36c08c7b7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TransformationOrder.scl +++ /dev/null @@ -1,17 +0,0 @@ -import "StandardLibrary" - -rule A where - @to - Execute (print "A") - -rule B where - @to - Execute (print "B") - -rule C where - @to - Execute (print "C") - -main = transformation OneShotForward where --- -() diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Tuples.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Tuples.scl deleted file mode 100644 index 5f70e4bea..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Tuples.scl +++ /dev/null @@ -1,18 +0,0 @@ -id0 () = () - -id0A :: () -> () -id0A () = () - -id2 (a,b) = (a,b) - -id2A :: (a,b) -> (a,b) -id2A (a,b) = (a,b) - -id3 (a,b,c) = (a,b,c) - -id3A :: (a,b,c) -> (a,b,c) -id3A (a,b,c) = (a,b,c) - -main = id3 (1 :: Integer,id0 (),3 :: Integer) --- -(1,(),3) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Tuples2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Tuples2.scl deleted file mode 100644 index 75b478513..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Tuples2.scl +++ /dev/null @@ -1,6 +0,0 @@ -// This is just a restricted version of Tuples test -id0 () = () - -main = id0 () --- -() \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias1.scl deleted file mode 100644 index 3aad9bf4f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias1.scl +++ /dev/null @@ -1,9 +0,0 @@ - -type Id = Integer - -incrementId :: Id -> Id -incrementId x = x - -main = incrementId 3 --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias2.scl deleted file mode 100644 index 61925153b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias2.scl +++ /dev/null @@ -1,8 +0,0 @@ -type List a = [a] - -convert :: List Integer -> List Double -convert v = v - -main = "Not to be executed." --- -4:13-4:14: Expected <[Double]> got <[Integer]>. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias3.scl deleted file mode 100644 index b25a8abfe..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAlias3.scl +++ /dev/null @@ -1,9 +0,0 @@ -type IntegerList = [Integer] -type DoubleList = [Double] - -convert :: IntegerList -> DoubleList -convert v = v - -main = "Not to be executed." --- -5:13-5:14: Expected <[Double]> got <[Integer]>. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAliasRefsToTypeAlias.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAliasRefsToTypeAlias.scl deleted file mode 100644 index 7ebb60636..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAliasRefsToTypeAlias.scl +++ /dev/null @@ -1,22 +0,0 @@ -type Foo = Bar -type Bar = Integer -main = 1 :: Foo --- -1 --- -type Bar = Integer -type Foo = Bar -main = 1 :: Foo --- -1 --- -type Foo = Foo -main = 1 :: Foo --- -1:1-1:15: Type alias has a self reference. --- -type Foo = Bar -type Bar = Foo -main = 1 :: Foo --- -1:1-1:15: Recursively defined type alias (Foo, Bar). \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAnnotation1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAnnotation1.scl deleted file mode 100644 index 5ba565f12..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAnnotation1.scl +++ /dev/null @@ -1,5 +0,0 @@ -id x = x :: Integer - -main = id "foo" --- -3:11-3:16: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAnnotation2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAnnotation2.scl deleted file mode 100644 index ab855f8dc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeAnnotation2.scl +++ /dev/null @@ -1,5 +0,0 @@ -id (x :: Integer) = x - -main = id "foo" --- -3:11-3:16: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClass.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClass.scl deleted file mode 100644 index 540d44e0e..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClass.scl +++ /dev/null @@ -1,10 +0,0 @@ - -class Foo a where - foo :: a -> Integer - -instance Foo Integer where - foo x = x - -main = foo (13 :: Integer) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClass2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClass2.scl deleted file mode 100644 index 5bd09350b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClass2.scl +++ /dev/null @@ -1,28 +0,0 @@ -import "JavaBuiltin" as Java - -(+) = Java.iadd - -class Foo a where - foo :: a -> Integer - /* -class (Foo a) => Bar a where - bar :: a -> Integer - */ -instance Foo Integer where - foo x = x+1 - /* -instance Bar Integer where - bar x = x+2 -*/ -data X a = X a - -instance (Foo a) => Foo (X a) where - foo (X a) = foo a - /* -instance (Bar a) => Bar (X a) where - bar (X a) = bar a*/ - -main = foo (X (1 :: Integer)) -// + bar (X (2 :: Integer)) --- -2 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClassBug1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClassBug1.scl deleted file mode 100644 index 2ea51bef6..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClassBug1.scl +++ /dev/null @@ -1,19 +0,0 @@ -import "JavaBuiltin" as Java - -importJava "org.simantics.scl.runtime.Lists" where - foldl :: (a -> b -> a) -> a -> [b] -> a - -class Additive a where - zero :: a - (+) :: a -> a -> a - - sum :: [a] -> a - sum = foldl (+) zero - -instance (Additive a, Additive b, Additive c) => Additive (a, b, c) where - zero = (zero, zero, zero) - (a0, b0, c0) + (a1, b1, c1) = (a0+a1, b0+b1, c0+c1) - -main = "OK" --- -OK \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClassBug2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClassBug2.scl deleted file mode 100644 index a341ba6b2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeClassBug2.scl +++ /dev/null @@ -1,54 +0,0 @@ -data Foo1 a = Foo1 a -data Foo2 a = Foo2 a - -foo1 :: Foo1 a -> a -foo1 (Foo1 x) = x - -foo2 :: Foo2 a -> a -foo2 (Foo2 x) = x - -class Makeable s where - make :: a -> s a - -instance Makeable Foo1 where - make = Foo1 - -instance Makeable Foo2 where - make = Foo2 - -class (Makeable f) => Foo f where - foo :: f a -> a - -class (Makeable b) => Bar b where - bar :: b a -> a - -class (Makeable b) => Baz b where - baz :: b a -> a - -class (Makeable b) => Bim b where - bim :: b a -> a - -instance Foo Foo1 where - foo = foo1 - -instance Bar Foo2 where - bar = foo2 - -instance (Bar b) => Baz b where - baz = bar - -instance Bim Foo1 where - bim = foo1 - -instance (Baz b) => Bim b where - bim = baz - -doFoo1 (Foo1 x) = x -doFoo2 (Foo2 x) = x - -useBim :: Bim b => (forall a. b a -> a) -> a -> [a] -useBim doit x = [doit (make x), bim (make x :: Foo1 a)] - -main = "OK" --- -"OK" diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeInferenceBug2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeInferenceBug2.scl deleted file mode 100644 index 4fa08a52d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeInferenceBug2.scl +++ /dev/null @@ -1,9 +0,0 @@ -import "Prelude" - -distance (x1,y1) (x2,y2) = let dx = x1-x2 - dy = y1-y2 - in sqrt (dx*dx + dy*dy) print x1 --- -5:31-5:35: Constrain Real ((a -> ()) -> ((c -> ()) -> e -> f) -> i) contains free variables not mentioned in the type of the value. -5:52-5:57: Constrain Show a contains free variables not mentioned in the type of the value. -5:58-5:60: Unification of types failed. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeOf1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeOf1.scl deleted file mode 100644 index 933a29b79..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypeOf1.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = typeOf (\(a,b) -> a+b :: Double) --- -(Double, Double) -> Double \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingBug1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingBug1.scl deleted file mode 100644 index 3e69ebf52..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingBug1.scl +++ /dev/null @@ -1,4 +0,0 @@ -id x = x -main = id id (5 :: Integer) --- -5 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingError1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingError1.scl deleted file mode 100644 index 9f39243c4..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingError1.scl +++ /dev/null @@ -1,9 +0,0 @@ -a :: Double -a = a - -id :: Integer -> Integer -id x = x - -b = id a --- -7:8-7:9: Expected got . \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingError2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingError2.scl deleted file mode 100644 index 7632ffcef..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/TypingError2.scl +++ /dev/null @@ -1,9 +0,0 @@ -a :: Integer -a = a - -id :: Integer -> Integer -id x = x - -b = id a a --- -7:5-7:11: Function of arity 1 is applied with 2 parameters. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnaryMinus.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnaryMinus.scl deleted file mode 100644 index ff0e51271..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnaryMinus.scl +++ /dev/null @@ -1,5 +0,0 @@ -import "Prelude" - -main = -5 --- --5 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UndefinedValue.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UndefinedValue.scl deleted file mode 100644 index 02de8b645..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UndefinedValue.scl +++ /dev/null @@ -1,6 +0,0 @@ - -foo :: Integer -// foo = 0 - --- -2:1-2:15: foo is not defined. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl deleted file mode 100644 index 270d5751b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl +++ /dev/null @@ -1,4 +0,0 @@ -a = = -b = 4 --- -1:5-1:6: Unexpected token '=' (EQUALS). Expected one of ATTACHED_HASH, BEGIN_STRING, BLANK, CHAR, DO, ENFORCE, EQ, ESCAPED_SYMBOL, FLOAT, ID, IF, INTEGER, LAMBDA, LBRACKET, LET, LPAREN, MATCH, MDO, MINUS, SELECT, SELECT_DISTINCT, SELECT_FIRST, TRANSFORMATION, WHEN. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Unification1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Unification1.scl deleted file mode 100644 index a174362f4..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Unification1.scl +++ /dev/null @@ -1,28 +0,0 @@ -import "JavaBuiltin" as Java -import "StandardLibrary" -import "Unification" - -pair :: Default a => Default b => UTag (a, b) (Unifiable a, Unifiable b) -pair = uTag 0 (\(ua, ub) -> (extract ua, extract ub)) Java.unsafeCoerce - -/*triple :: Default a => Default b => Default c => - UTag (a, b, c) (Unifiable a, Unifiable b, Unifiable c)*/ -triple = uTag 0 (\(ua, ub, uc) -> (extract ua, extract ub, extract uc)) Java.unsafeCoerce - -main :: (Integer,Integer,Integer) -main = do - um1 = createUMap - um2 = createUMap - v1 = uVar - v2 = uVar - v3 = uVar - vX = uVar - putUMap um1 "a" (uCons triple (v1, v2, v3)) - putUMap um1 "a" (uCons triple (v2, v3, v1)) - putUMap um1 "a" (uCons triple (vX, uVar, uVar)) - putUMap um2 "b" vX - putUMapC um2 "b" 12 - - getUMap um1 "a" --- -(12,12,12) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnknownAnnotation.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnknownAnnotation.scl deleted file mode 100644 index c1b5ef8ea..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnknownAnnotation.scl +++ /dev/null @@ -1,5 +0,0 @@ - -@sdlfkmsdlfkm -main = "Not to be executed" --- -2:1-2:14: Unknown annotation. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedClass.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedClass.scl deleted file mode 100644 index 0e1765c4d..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedClass.scl +++ /dev/null @@ -1,8 +0,0 @@ - -data List a = Nil | Cons a (List a) - -instance Monoid List where - zero = Nil - --- -4:10-4:16: Couldn't resolve class Monoid. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedTypeInAnnotation.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedTypeInAnnotation.scl deleted file mode 100644 index 18e075104..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedTypeInAnnotation.scl +++ /dev/null @@ -1,4 +0,0 @@ -main :: List Integer -main = 13 --- -1:9-1:13: Didn't find type constructor List. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedTypeInInstance.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedTypeInInstance.scl deleted file mode 100644 index 1b5400cb0..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedTypeInInstance.scl +++ /dev/null @@ -1,9 +0,0 @@ -class Functor f where - map :: (a -> b) -> f a -> f b - -data Iddd a = Idd a - -instance Functor Idd where - map (Idd x) = x --- -6:18-6:21: Didn't find type constructor Idd. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl deleted file mode 100644 index ad28907ee..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl +++ /dev/null @@ -1,4 +0,0 @@ -a = b - --- -1:5-1:6: Couldn't resolve variable b. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl deleted file mode 100644 index 32438cda2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl +++ /dev/null @@ -1,7 +0,0 @@ - -a = a -b = b -c = a + b - --- -4:7-4:8: Couldn't resolve variable +. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ValueAsOperator.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ValueAsOperator.scl deleted file mode 100644 index 37235370f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ValueAsOperator.scl +++ /dev/null @@ -1,8 +0,0 @@ - -data List a = Nil | Cons a (List a) - -data Foo = Foo - -main = Foo `Cons` (Foo `Cons` Nil) --- -(Cons Foo (Cons Foo Nil)) \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ValueConversion.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ValueConversion.scl deleted file mode 100644 index 3afda1b32..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/ValueConversion.scl +++ /dev/null @@ -1,6 +0,0 @@ -import "Prelude" -import "Vector" - -main = fromDynamic (toDynamic (vector [3 :: Double])) :: [Double] --- -[3.0] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Vector1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Vector1.scl deleted file mode 100644 index 33b6c86df..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Vector1.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "StandardLibrary" - -a :: Vector Double -a = vector [1,2,3] - -main = map (a !) [0..length a-1] --- -[1.0, 2.0, 3.0] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Vector2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Vector2.scl deleted file mode 100644 index 43c0c5359..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Vector2.scl +++ /dev/null @@ -1,8 +0,0 @@ -import "StandardLibrary" - -convertDataset :: [Double] -> [Double] -> Vector (Vector Double) -convertDataset xs ys = vector [vector xs, vector ys] - -main = "Foo" --- -Foo \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void1.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void1.scl deleted file mode 100644 index 40a710fa2..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void1.scl +++ /dev/null @@ -1,16 +0,0 @@ -importJava "java.util.List" where - data List a - - @JavaName add - addList :: List a -> a -> Boolean - -importJava "java.util.ArrayList" where - @JavaName "" - newList :: () -> (List a) - -main = do - l = newList () - addList l (3 :: Integer) - l --- -[3] \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void2.scl deleted file mode 100644 index f953aaf58..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void2.scl +++ /dev/null @@ -1,13 +0,0 @@ -import "JavaBuiltin" as Java - -class Foo a where - foo :: a -> () -> a - -instance Foo Integer where - foo x () = x - -idWithFoo x = foo x () - -main = idWithFoo (13 :: Integer) --- -13 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void3.scl deleted file mode 100644 index 0530c8a11..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/Void3.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "JavaBuiltin" as Java - -data Foo = Foo () - - -ff = Foo () - -gg () = 3 :: Integer - -main = gg (match ff with Foo a -> a) --- -3 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While.scl deleted file mode 100644 index 3e450439b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While.scl +++ /dev/null @@ -1,10 +0,0 @@ - -while :: ( Boolean) -> ( a) -> () -while cond body = loop () - where loop _ = if cond - then do body ; loop () - else () - -main = "FOO" --- -FOO \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While2.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While2.scl deleted file mode 100644 index 6567c22ab..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While2.scl +++ /dev/null @@ -1,12 +0,0 @@ -import "Prelude" hiding (while) - -while :: Maybe Boolean -> Maybe a -> Maybe () -while condM bodyM = mdo - cond <- condM - if cond - then bodyM >> while condM bodyM - else return () - -main = "FOO" --- -FOO \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While3.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While3.scl deleted file mode 100644 index 052076958..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/While3.scl +++ /dev/null @@ -1,11 +0,0 @@ -import "Prelude" - -main = do - a = ref 1 - b = ref 0 - while (getRef a < 5) do - b := getRef b + 1 - a := getRef a + 1 - getRef b --- -4 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/WrongDefaultMethod.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/WrongDefaultMethod.scl deleted file mode 100644 index d94046b4a..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/WrongDefaultMethod.scl +++ /dev/null @@ -1,8 +0,0 @@ - -class Foo a where - foo :: a - bar = foo - -main = "Not to be executed." --- -4:5-4:14: Method bar is not defined in this class. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/WrongInstanceMethod.scl b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/WrongInstanceMethod.scl deleted file mode 100644 index 2cdc4e86b..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scl/WrongInstanceMethod.scl +++ /dev/null @@ -1,11 +0,0 @@ - -class Foo a where - foo :: a - -instance Foo Integer where - foo = foo - bar = foo - -main = "Not to be executed." --- -7:5-7:14: Method bar is not defined in the type class Foo. \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Arithmetic.sts b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Arithmetic.sts deleted file mode 100644 index e8f7dce07..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Arithmetic.sts +++ /dev/null @@ -1,12 +0,0 @@ -> 1+1 -2 -> 1-1 -0 -> 1+1.0 -2.0 -> 2*5 -10 -> 4/3 -1.3333333333333333 -> 4 `div` 3 -1 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Functions.sts b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Functions.sts deleted file mode 100644 index 76348b876..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Functions.sts +++ /dev/null @@ -1,20 +0,0 @@ -> id x = x -> id 2 -2 -> id "Hello!" -"Hello!" - -> id = \x -> x -> id 2 -2 - -> fib 0 = 1 -> fib 1 = 1 -> fib n = fib (n-1) + fib (n-2) - -> fib 2 -2 -> fib 3 -3 -> fib 4 -5 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Functions2.sts b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Functions2.sts deleted file mode 100644 index 9879931b7..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Functions2.sts +++ /dev/null @@ -1,5 +0,0 @@ -> f x = x + 1 -> f 3 -4 -> f 4.5 -5.5 \ No newline at end of file diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Lists.sts b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Lists.sts deleted file mode 100644 index 024db2467..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/scripts/Lists.sts +++ /dev/null @@ -1,5 +0,0 @@ -> [1,2,3] -[1, 2, 3] - -> [5..9] -[5, 6, 7, 8, 9] diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestConstraintSolver.java b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestConstraintSolver.java deleted file mode 100644 index a6aad45cc..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestConstraintSolver.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.simantics.scl.compiler.tests.unit; - -import org.junit.Test; -import org.simantics.scl.compiler.environment.Environment; -import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification; -import org.simantics.scl.compiler.errors.Locations; -import org.simantics.scl.compiler.internal.elaboration.constraints2.ConstraintSolver; -import org.simantics.scl.compiler.tests.TestBase; -import org.simantics.scl.compiler.types.TCon; -import org.simantics.scl.compiler.types.TMetaVar; -import org.simantics.scl.compiler.types.Types; -import org.simantics.scl.compiler.types.kinds.Kinds; - -public class TestConstraintSolver { - - public final TCon COLLECTION = Types.con("Collection", "Collection"); - - @Test - public void testConstraintSolver() throws Exception { - EnvironmentSpecification environmentSpecification = new EnvironmentSpecification(); - environmentSpecification.importModule("Builtin", ""); - environmentSpecification.importModule("Prelude", ""); - environmentSpecification.importModule("Collection", ""); - - Environment environment = TestBase.PRELUDE_MODULE_REPOSITORY - .createRuntimeEnvironment(environmentSpecification, - getClass().getClassLoader()).getEnvironment(); - - ConstraintSolver solver = new ConstraintSolver(environment); - - TMetaVar a = Types.metaVar(Kinds.STAR); - TMetaVar b = Types.metaVar(Kinds.STAR); - solver.addDemand(Types.pred(COLLECTION, Types.list(a), b), Locations.NO_LOCATION); - - solver.print(); - } - -} diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java deleted file mode 100644 index fa3bd9f65..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.simantics.scl.compiler.tests.unit; - -import java.util.Collection; - -import org.junit.Test; -import org.simantics.scl.compiler.environment.filter.AcceptAllNamespaceFilter; -import org.simantics.scl.compiler.environment.filter.NamespaceFilter; -import org.simantics.scl.compiler.environment.filter.NamespaceFilters; -import org.simantics.scl.compiler.environment.filter.NegativeNamespaceFilter; -import org.simantics.scl.compiler.environment.filter.PositiveNamespaceFilter; - -import gnu.trove.set.hash.THashSet; -import junit.framework.Assert; - -public class TestNamespaceFilter { - - private void testBooleanOperations(Collection all, NamespaceFilter a, NamespaceFilter b) { - { - NamespaceFilter c = NamespaceFilters.union(a, b); - //System.out.println("union(" + a + ", " + b + ") = " + c); - for(String name : all) - Assert.assertEquals( - a.isValueIncluded(name) || b.isValueIncluded(name), - c.isValueIncluded(name)); - } - { - NamespaceFilter c = NamespaceFilters.intersection(a, b); - //System.out.println("intersection(" + a + ", " + b + ") = " + c); - for(String name : all) - Assert.assertEquals( - a.isValueIncluded(name) && b.isValueIncluded(name), - c.isValueIncluded(name)); - } - } - - private void testBooleanOperations(THashSet a, THashSet b) { - THashSet all = new THashSet(); - all.addAll(a); - all.addAll(b); - all.add("dummy"); - - PositiveNamespaceFilter pa = new PositiveNamespaceFilter(a); - NegativeNamespaceFilter na = new NegativeNamespaceFilter(a); - PositiveNamespaceFilter pb = new PositiveNamespaceFilter(b); - NegativeNamespaceFilter nb = new NegativeNamespaceFilter(b); - testBooleanOperations(all, pa, pb); - testBooleanOperations(all, na, pb); - testBooleanOperations(all, pa, nb); - testBooleanOperations(all, na, nb); - } - - private void testBooleanOperations(THashSet a) { - THashSet all = new THashSet(); - all.addAll(a); - all.add("dummy"); - - PositiveNamespaceFilter pa = new PositiveNamespaceFilter(a); - NegativeNamespaceFilter na = new NegativeNamespaceFilter(a); - testBooleanOperations(all, pa, AcceptAllNamespaceFilter.INSTANCE); - testBooleanOperations(all, na, AcceptAllNamespaceFilter.INSTANCE); - testBooleanOperations(all, AcceptAllNamespaceFilter.INSTANCE, pa); - testBooleanOperations(all, AcceptAllNamespaceFilter.INSTANCE, na); - testBooleanOperations(all, AcceptAllNamespaceFilter.INSTANCE, AcceptAllNamespaceFilter.INSTANCE); - } - - @Test - public void testBooleanOperations() { - for(int p=0;p<8;++p) { - THashSet a = new THashSet(); - for(int i=0;i<3;++i) - if(((p >> i) & 1) == 1) - a.add(String.valueOf(i)); - testBooleanOperations(a); - } - - for(int p=0;p<64;++p) { - THashSet a = new THashSet(); - THashSet b = new THashSet(); - for(int i=0;i<3;++i) { - if(((p >> i) & 1) == 1) - a.add(String.valueOf(i)); - if(((p >> (i+3)) & 1) == 1) - b.add(String.valueOf(i)); - } - testBooleanOperations(a, b); - } - } - -} diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestSubSolver.java b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestSubSolver.java deleted file mode 100644 index 87b9eeb4f..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestSubSolver.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.simantics.scl.compiler.tests.unit; - -import java.util.ArrayList; - -import org.junit.Assert; -import org.junit.Test; -import org.simantics.scl.compiler.errors.ErrorLog; -import org.simantics.scl.compiler.internal.elaboration.subsumption.SubSolver; -import org.simantics.scl.compiler.internal.elaboration.subsumption.Subsumption; -import org.simantics.scl.compiler.types.TMetaVar; -import org.simantics.scl.compiler.types.Type; -import org.simantics.scl.compiler.types.Types; -import org.simantics.scl.compiler.types.kinds.Kinds; -import org.simantics.scl.compiler.types.util.Polarity; - - -public class TestSubSolver { - - @Test - public void testBipolarBounded() { - ErrorLog errorLog = new ErrorLog(); - ArrayList subsumptions = new ArrayList(); - ArrayList potentialSingletonEffects = new ArrayList(); - - TMetaVar in = Types.metaVar(Kinds.EFFECT); - TMetaVar out = Types.metaVar(Kinds.EFFECT); - in.addPolarity(Polarity.NEGATIVE); - out.addPolarity(Polarity.POSITIVE); - subsumptions.add(new Subsumption(0, Types.READ_GRAPH, out)); - subsumptions.add(new Subsumption(0, in, out)); - - SubSolver solver = new SubSolver(errorLog, subsumptions, potentialSingletonEffects, 0); - solver.solve(); - Assert.assertEquals("", errorLog.getErrorsAsString()); - } - -} diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestTypeParser.java b/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestTypeParser.java deleted file mode 100644 index 5ce369042..000000000 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/unit/TestTypeParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.simantics.scl.compiler.tests.unit; - -import org.junit.Test; -import org.simantics.scl.compiler.environment.Environment; -import org.simantics.scl.compiler.environment.Environments; -import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification; -import org.simantics.scl.compiler.runtime.RuntimeEnvironment; -import org.simantics.scl.compiler.tests.TestBase; -import org.simantics.scl.compiler.types.Type; - -public class TestTypeParser { - - @Test - public void testTypeParser() throws Exception { - EnvironmentSpecification spec = new EnvironmentSpecification(); - spec.importModule("Builtin", ""); - spec.importModule("Prelude", ""); - RuntimeEnvironment runtimeEnvironment = - TestBase.PRELUDE_MODULE_REPOSITORY.createRuntimeEnvironment(spec, getClass().getClassLoader()); - Environment environment = runtimeEnvironment.getEnvironment(); - Type type = Environments.getType(environment, "String -> ()"); - System.out.println(type); - } - -} diff --git a/bundles/org.simantics.scl.compiler/tools/procyon-decompiler-0.5.29.jar b/bundles/org.simantics.scl.compiler/tools/procyon-decompiler-0.5.29.jar deleted file mode 100644 index e7dccc916..000000000 Binary files a/bundles/org.simantics.scl.compiler/tools/procyon-decompiler-0.5.29.jar and /dev/null differ diff --git a/bundles/org.simantics.scl.data/scl/Data/Json.scl b/bundles/org.simantics.scl.data/scl/Data/Json.scl index fb034cd57..63c51a56b 100644 --- a/bundles/org.simantics.scl.data/scl/Data/Json.scl +++ b/bundles/org.simantics.scl.data/scl/Data/Json.scl @@ -52,8 +52,6 @@ importJava "com.fasterxml.jackson.core.JsonToken" where VALUE_NUMBER_INT :: JsonToken VALUE_STRING :: JsonToken VALUE_TRUE :: JsonToken -instance Eq JsonToken where - (==) = Java.equals importJava "com.fasterxml.jackson.core.JsonParser" where data JsonParser @@ -301,9 +299,7 @@ data Json = data JsonField = JsonField String Json deriving instance Show Json -deriving instance Eq Json deriving instance Show JsonField -deriving instance Eq JsonField instance Json Json where writeJson g (JsonString value) = writeString g value @@ -366,7 +362,7 @@ makeTypeEqual :: a -> a -> () makeTypeEqual _ _ = () @private -testValue :: Json a => Show a => Eq a => a -> () +testValue :: Json a => Show a => a -> () testValue v1 = do v2 = toJsonString v1 v3 = fromJsonString v2 diff --git a/bundles/org.simantics.scl.data/scl/Data/XML.scl b/bundles/org.simantics.scl.data/scl/Data/XML.scl index 05fef9c99..b49f6a6c1 100644 --- a/bundles/org.simantics.scl.data/scl/Data/XML.scl +++ b/bundles/org.simantics.scl.data/scl/Data/XML.scl @@ -51,12 +51,6 @@ importJava "org.jdom2.Element" where setAttribute :: Element -> String -> String -> () - @JavaName equals - equalsElement :: Element -> Element -> Boolean - -instance Eq Element where - (==) = equalsElement - importJava "org.jdom2.Attribute" where data Attribute diff --git a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl index 74bc42204..ae092cfa8 100644 --- a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl +++ b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl @@ -22,21 +22,9 @@ importJava "org.simantics.db.Resource" where importJava "org.simantics.db.ReadGraph" where data ReadGraphX -importJava "java.lang.Object" where - @JavaName equals - resourceEquals :: Resource -> Resource -> Boolean - @JavaName hashCode - resourceHash :: Resource -> Integer - -instance Eq Resource where - (==) = resourceEquals - instance Ord Resource where compare a b = compare (resourceId a) (resourceId b) - -instance Hashable Resource where - hashP = hashP . resourceHash - + instance Show Resource where show r = "#" + show (resourceId r) diff --git a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl index bcfd43a64..473f4431a 100644 --- a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl +++ b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl @@ -2,32 +2,6 @@ include "Simantics/Model" include "Simantics/DB" import "Simantics/DB" as DB -importJava "java.lang.Object" where - @JavaName equals - """ -Function **variableEquals** compares the given input variables and returns True if they are the same. - -Example: - - import "Simantics/Variables" - import "Apros/Module" - my_variable_1 = moduleVariable "PO01" - my_variable_2 = moduleVariable "PO02" - variableEquals my_variable_1 my_variable_2 - - > False - - """ - variableEquals :: Variable -> Variable -> Boolean - @JavaName hashCode - variableHash :: Variable -> Integer - -instance Eq Variable where - (==) = variableEquals - -instance Hashable Variable where - hashP = hashP . variableHash - importJava "org.simantics.db.layer0.variable.Variables" where @JavaName getVariable """ diff --git a/bundles/org.simantics.scl.osgi/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.osgi/META-INF/MANIFEST.MF index 3735620b8..a1033a4a4 100755 --- a/bundles/org.simantics.scl.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.osgi/META-INF/MANIFEST.MF @@ -6,13 +6,13 @@ Bundle-Version: 1.0.4.qualifier Bundle-Activator: org.simantics.scl.osgi.internal.Activator Require-Bundle: org.eclipse.core.runtime, gnu.trove3;bundle-version="3.0.0", - org.simantics.scl.compiler;bundle-version="0.2.0";visibility:=reexport + org.simantics.scl.compiler;bundle-version="0.6.0";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.scl.osgi, org.simantics.scl.osgi.internal -Service-Component: OSGI-INF/org.simantics.scl.osgi.internal.BundleTestScriptRepository.xml, +Service-Component: OSGI-INF/org.simantics.scl.osgi.internal.BundleModuleSourceRepository.xml, OSGI-INF/org.simantics.scl.osgi.internal.FileSystemModuleSourceRepository.xml, - OSGI-INF/org.simantics.scl.osgi.internal.BundleModuleSourceRepository.xml + OSGI-INF/org.simantics.scl.osgi.internal.BundleTestScriptRepository.xml Import-Package: org.osgi.service.component, org.osgi.service.component.annotations diff --git a/bundles/org.simantics.scl.osgi/build.properties b/bundles/org.simantics.scl.osgi/build.properties index 52b72c35d..6825bb448 100755 --- a/bundles/org.simantics.scl.osgi/build.properties +++ b/bundles/org.simantics.scl.osgi/build.properties @@ -3,7 +3,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ scl/,\ - OSGI-INF/org.simantics.scl.osgi.internal.BundleTestScriptRepository.xml,\ + OSGI-INF/org.simantics.scl.osgi.internal.BundleModuleSourceRepository.xml,\ OSGI-INF/org.simantics.scl.osgi.internal.FileSystemModuleSourceRepository.xml,\ - OSGI-INF/org.simantics.scl.osgi.internal.BundleModuleSourceRepository.xml + OSGI-INF/org.simantics.scl.osgi.internal.BundleTestScriptRepository.xml src.includes = scl/ diff --git a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSource.java b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSource.java index 975dd57fd..a4dce2101 100644 --- a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSource.java +++ b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSource.java @@ -1,6 +1,5 @@ package org.simantics.scl.osgi.internal; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; diff --git a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSourceRepository.java b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSourceRepository.java index 31d06b726..b3f5ac319 100644 --- a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSourceRepository.java +++ b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/BundleModuleSourceRepository.java @@ -2,6 +2,7 @@ package org.simantics.scl.osgi.internal; import java.net.URL; import java.util.ArrayList; +import java.util.Collection; import java.util.Enumeration; import org.osgi.framework.Bundle; @@ -14,16 +15,14 @@ import org.osgi.service.component.annotations.Deactivate; import org.osgi.util.tracker.BundleTracker; import org.simantics.scl.compiler.module.repository.UpdateListener; import org.simantics.scl.compiler.source.ModuleSource; -import org.simantics.scl.compiler.source.repository.AbstractModuleSourceRepository; import org.simantics.scl.compiler.source.repository.ModuleSourceRepository; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectObjectProcedure; -import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; @Component -public class BundleModuleSourceRepository extends AbstractModuleSourceRepository implements ModuleSourceRepository { +public class BundleModuleSourceRepository implements ModuleSourceRepository { Tracker tracker; THashMap modules = new THashMap(); @@ -107,8 +106,13 @@ public class BundleModuleSourceRepository extends AbstractModuleSourceRepository } @Override - synchronized public void forAllModules(TObjectProcedure procedure) { - modules.forEachKey(procedure); + public synchronized Collection getModuleNames() { + return new ArrayList(modules.keySet()); + } + + @Override + public synchronized Collection getDocumentationNames() { + return new ArrayList(documentations.keySet()); } @Override @@ -119,12 +123,7 @@ public class BundleModuleSourceRepository extends AbstractModuleSourceRepository else return source.getText(); } - - @Override - synchronized public void forAllDocumentations(TObjectProcedure procedure) { - documentations.forEachKey(procedure); - } - + @Override public void checkUpdates() { synchronized(this) { diff --git a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/FileSystemModuleSourceRepository.java b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/FileSystemModuleSourceRepository.java index 0e26c1d27..68e6ac050 100644 --- a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/FileSystemModuleSourceRepository.java +++ b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/FileSystemModuleSourceRepository.java @@ -1,6 +1,8 @@ package org.simantics.scl.osgi.internal; import java.io.File; +import java.util.Collection; +import java.util.Collections; import org.osgi.service.component.annotations.Component; import org.simantics.scl.compiler.module.repository.UpdateListener; @@ -23,23 +25,12 @@ public class FileSystemModuleSourceRepository implements ModuleSourceRepository } @Override - synchronized public void forAllModules(TObjectProcedure procedure) { + public Collection getModuleNames() { + return Collections.emptyList(); } @Override - public String getDocumentation(String documentationName) { - return null; + public void forAllModules(TObjectProcedure procedure) { } - @Override - public void forAllDocumentations(TObjectProcedure procedure) { - } - - @Override - public void checkUpdates() { - } - - @Override - public void clear() { - } } diff --git a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/ServiceBasedModuleSourceRepository.java b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/ServiceBasedModuleSourceRepository.java index 9b173e48d..ac8384c24 100644 --- a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/ServiceBasedModuleSourceRepository.java +++ b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/ServiceBasedModuleSourceRepository.java @@ -1,6 +1,7 @@ package org.simantics.scl.osgi.internal; -import gnu.trove.procedure.TObjectProcedure; +import java.util.ArrayList; +import java.util.Collection; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; @@ -8,6 +9,8 @@ import org.simantics.scl.compiler.module.repository.UpdateListener; import org.simantics.scl.compiler.source.ModuleSource; import org.simantics.scl.compiler.source.repository.ModuleSourceRepository; +import gnu.trove.procedure.TObjectProcedure; + public class ServiceBasedModuleSourceRepository implements ModuleSourceRepository { ServiceTracker sourceRepositories; @@ -45,6 +48,7 @@ public class ServiceBasedModuleSourceRepository implements ModuleSourceRepositor @Override public String getDocumentation(String documentationName) { + // getServices is internally synchronized, so no need to synchronize here Object[] services = sourceRepositories.getServices(); if(services != null) for(Object sourceRepository_ : services) { @@ -58,18 +62,43 @@ public class ServiceBasedModuleSourceRepository implements ModuleSourceRepositor @Override public void forAllModules(TObjectProcedure procedure) { - for(Object sourceRepository_ : sourceRepositories.getServices()) { - ModuleSourceRepository sourceLoader = (ModuleSourceRepository)sourceRepository_; - sourceLoader.forAllModules(procedure); - } + // getServices is internally synchronized, so no need to synchronize here + Object[] services = sourceRepositories.getServices(); + if(services != null) + for(Object sourceRepository_ : services) { + ModuleSourceRepository sourceLoader = (ModuleSourceRepository)sourceRepository_; + sourceLoader.forAllModules(procedure); + } + } + + @Override + public Collection getModuleNames() { + ArrayList result = new ArrayList<>(); + forAllModules((String name) -> { + result.add(name); + return true; + }); + return result; } @Override public void forAllDocumentations(TObjectProcedure procedure) { - for(Object sourceRepository_ : sourceRepositories.getServices()) { - ModuleSourceRepository sourceLoader = (ModuleSourceRepository)sourceRepository_; - sourceLoader.forAllDocumentations(procedure); - } + Object[] services = sourceRepositories.getServices(); + if(services != null) + for(Object sourceRepository_ : services) { + ModuleSourceRepository sourceLoader = (ModuleSourceRepository)sourceRepository_; + sourceLoader.forAllDocumentations(procedure); + } + } + + @Override + public Collection getDocumentationNames() { + ArrayList result = new ArrayList<>(); + forAllDocumentations((String name) -> { + result.add(name); + return true; + }); + return result; } @Override @@ -80,8 +109,4 @@ public class ServiceBasedModuleSourceRepository implements ModuleSourceRepositor } } - @Override - public void clear() { - } - } diff --git a/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF index 7274b0bf2..32ac1e0a6 100755 --- a/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.simantics.scl.runtime;singleton:=true Bundle-Version: 0.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.scl.runtime, + org.simantics.scl.runtime.chr, org.simantics.scl.runtime.collection, org.simantics.scl.runtime.exceptions, org.simantics.scl.runtime.function, diff --git a/bundles/org.simantics.scl.runtime/scl/Arbitrary.scl b/bundles/org.simantics.scl.runtime/scl/Arbitrary.scl index 17a6ec65f..a19f7eb5b 100644 --- a/bundles/org.simantics.scl.runtime/scl/Arbitrary.scl +++ b/bundles/org.simantics.scl.runtime/scl/Arbitrary.scl @@ -77,7 +77,7 @@ randomIdentifierCharacter = let p = randomN 100 instance Arbitrary Character where arbitrary = genRandom randomCharacter instance CoArbitrary Character where - variateSeed _ seed v = seed + fromInteger (hash (showCharacter v)) + variateSeed _ seed v = seed + fromInteger (hashCode (showCharacter v)) """Generates a random string that is a valid SCL or Java identifier""" arbitraryIdentifier = Gen $ \n -> string (Vector.vectorF (1+randomN (max n 1)) @@ -86,7 +86,7 @@ arbitraryIdentifier = Gen $ \n -> string (Vector.vectorF (1+randomN (max n 1)) instance Arbitrary String where arbitrary = Gen $ \n -> string (Vector.vectorF (randomN (1+n)) (\_ -> randomCharacter)) instance CoArbitrary String where - variateSeed _ seed v = seed + fromInteger (hash v) + variateSeed _ seed v = seed + fromInteger (hashCode v) instance Arbitrary () where arbitrary = genRandom () diff --git a/bundles/org.simantics.scl.runtime/scl/ArrayList.scl b/bundles/org.simantics.scl.runtime/scl/ArrayList.scl index be42bc931..290d7a667 100644 --- a/bundles/org.simantics.scl.runtime/scl/ArrayList.scl +++ b/bundles/org.simantics.scl.runtime/scl/ArrayList.scl @@ -32,7 +32,7 @@ importJava "java.util.ArrayList" where @JavaName size length :: T a -> Integer -contains :: Eq a => T a -> a -> Boolean +contains :: T a -> a -> Boolean contains l a = loop 0 where len = length l diff --git a/bundles/org.simantics.scl.runtime/scl/BigInteger.scl b/bundles/org.simantics.scl.runtime/scl/BigInteger.scl index af9093701..cdc0ad102 100644 --- a/bundles/org.simantics.scl.runtime/scl/BigInteger.scl +++ b/bundles/org.simantics.scl.runtime/scl/BigInteger.scl @@ -42,9 +42,6 @@ importJava "java.math.BigInteger" where @JavaName intValue toIntegerBigInteger :: BigInteger -> Integer -instance Eq BigInteger where - (==) = equalsBigInteger - instance Show BigInteger where show = showBigInteger @@ -53,9 +50,6 @@ instance Ord BigInteger where min = minBigInteger max = maxBigInteger -instance Hashable BigInteger where - hashP v x = hashBigInteger v + 31*x - instance Additive BigInteger where zero = zeroBigInteger (+) = addBigInteger diff --git a/bundles/org.simantics.scl.runtime/scl/Collection.scl b/bundles/org.simantics.scl.runtime/scl/Collection.scl index 63df23323..418e8f03b 100644 --- a/bundles/org.simantics.scl.runtime/scl/Collection.scl +++ b/bundles/org.simantics.scl.runtime/scl/Collection.scl @@ -12,7 +12,7 @@ class Collection a where all :: (El a -> Boolean) -> a -> Boolean filter :: (El a -> Boolean) -> a -> a partition :: (El a -> Boolean) -> a -> (a,a) - groupBy :: Hashable b => (El a -> b) -> [(b, a)] + groupBy :: (El a -> b) -> [(b, a)] uniqueElement :: a -> El a // may fail fromList :: [El a] -> a toList :: a -> [El a] @@ -37,9 +37,9 @@ class (Collection a) => Sequence a where foldl1 :: (El a -> El a -> El a) -> a -> a foldr1 :: (El a -> El a -> El a) -> a -> a - elem :: Eq (El a) => El a -> a -> Boolean - elemIndex :: Eq (El a) => El a -> a -> Maybe Integer - elemIndices :: Eq (El a) => El a -> a -> [Integer] + elem :: El a -> a -> Boolean + elemIndex :: El a -> a -> Maybe Integer + elemIndices :: El a -> a -> [Integer] find :: (El a -> Boolean) -> a -> Maybe (El a) findIndex :: (El a -> Boolean) -> a -> Maybe Integer findIndices :: (El a -> Boolean) -> a -> [Integer] diff --git a/bundles/org.simantics.scl.runtime/scl/Databoard.scl b/bundles/org.simantics.scl.runtime/scl/Databoard.scl index f81376621..87afb8e53 100644 --- a/bundles/org.simantics.scl.runtime/scl/Databoard.scl +++ b/bundles/org.simantics.scl.runtime/scl/Databoard.scl @@ -56,17 +56,11 @@ importJava "org.simantics.databoard.type.Datatype" where "Get a component type of a composite data type" @JavaName getComponentType datatypeComponentType :: Datatype -> ChildReference -> Datatype - - @private - @JavaName equals - datatypeEquals :: Datatype -> Datatype -> Boolean + instance Show Datatype where show = showDatatype -instance Eq Datatype where - (==) = datatypeEquals - /// Binding /// importJava "org.simantics.databoard.binding.Binding" where @@ -81,10 +75,6 @@ importJava "org.simantics.databoard.binding.Binding" where @JavaName compare compareObjects :: Serializable a => a -> a -> Integer - "Return true, if two serializable values are equal" - @JavaName equals - serializableEq :: Serializable a => a -> a -> Boolean - "The default value of a serializable type" @JavaName createDefault serializableDefaultValue :: Serializable a => a @@ -105,13 +95,6 @@ importJava "org.simantics.databoard.binding.Binding" where @JavaName getComponentBinding getComponentBinding :: Binding a -> ChildReference -> Binding b - @private - @JavaName equals - bindingEquals :: Binding a -> Binding a -> Boolean - -instance Eq (Binding a) where - (==) = bindingEquals - "Get a child data component of a composite serializable value" getSerializableComponent :: Serializable a => Serializable b => a -> ChildReference -> b getSerializableComponent object ref = getSerializableComponent_ object ref binding diff --git a/bundles/org.simantics.scl.runtime/scl/Prelude.scl b/bundles/org.simantics.scl.runtime/scl/Prelude.scl index 21658862d..c2307014a 100644 --- a/bundles/org.simantics.scl.runtime/scl/Prelude.scl +++ b/bundles/org.simantics.scl.runtime/scl/Prelude.scl @@ -39,10 +39,6 @@ binding :: Serializable a => Binding a ***********************************************************/ importJava "java.util.Arrays" where - @private - @JavaName equals - equalsDoubleArray :: DoubleArray -> DoubleArray -> Boolean - @private @JavaName toString showDoubleArray :: DoubleArray -> String @@ -56,8 +52,6 @@ importJava "java.util.List" where @JavaName toArray listToArray :: [a] -> Array a -instance Eq DoubleArray where - (==) = equalsDoubleArray instance Show DoubleArray where show = showDoubleArray @@ -77,7 +71,7 @@ infixr 8 (^) infixl 7 (*), (/), div, mod infixl 6 (+), (-) infixl 5 (\\), (<<), (<+) -infix 4 (==), (!=), (<), (<=), (>=), (>) +infix 4 (!=), (<), (<=), (>=), (>) infixr 3 (&&), (&<&) infixr 2 (||), orElse, morelse infixr 1 (>>=), (>>), (:=) @@ -134,23 +128,15 @@ swap (x,y) = (y,x) /// Comparison /// -""" -The class of types whose elements can be compared for equality. -Method `(==)` must be implemented in instances. -""" -class Eq a where - "Equality" - (==) :: a -> a -> Boolean - "Inequality: `a != b = not (a == b)`" - (!=) :: a -> a -> Boolean - - a != b = not (a == b) +@inline +(!=) :: a -> a -> Boolean +a != b = not (a == b) """ The class of linearly ordered types. Method `compare` must be implemented in instances. """ -class (Eq a) => Ord a where +class Ord a where """ `compare x y` returns a negative number, if `x` is smaller than `y`, a positive number, if `x` is bigger than `y` and zero if they are equal. @@ -220,17 +206,6 @@ minimumBy f l = snd $ foldl1 minF $ map (\x -> (f x, x)) l where minF a b = if fst a <= fst b then a else b -""" -The class of types with method to compute hash codes. -""" -class (Eq a) => Hashable a where - "`hashP v seed` computes the hash code of `v` using `seed` as a seed." - hashP :: a -> Integer -> Integer - -"`hash v` computes the hash code of `v`" -hash :: Hashable a => a -> Integer -hash a = hashP a 1166136261 - /// Functions /// /* instance Functor ((->) a) where @@ -566,10 +541,6 @@ importJava "java.lang.Byte" where @JavaName parseByte readByte :: String -> Byte -instance Eq Byte where - (==) = Java.bcmpeq - (!=) = Java.bcmpne - instance Ord Byte where (<) = Java.bcmplt (<=) = Java.bcmple @@ -603,10 +574,6 @@ importJava "java.lang.Short" where @JavaName parseShort readShort :: String -> Short -instance Eq Short where - (==) = Java.scmpeq - (!=) = Java.scmpne - instance Ord Short where (<) = Java.scmplt (<=) = Java.scmple @@ -641,18 +608,11 @@ importJava "java.lang.Integer" where @JavaName parseInt readInteger :: String -> Integer -instance Eq Integer where - (==) = Java.icmpeq - (!=) = Java.icmpne - instance Ord Integer where (<) = Java.icmplt (<=) = Java.icmple (>) = Java.icmpgt (>=) = Java.icmpge - -instance Hashable Integer where - hashP v x = Java.ixor v (Java.imul x 16777619) // prime for FNV-1 hash instance Additive Integer where zero = Java.iconst_0 @@ -690,18 +650,11 @@ importJava "java.lang.Long" where @JavaName parseLong readLong :: String -> Long -instance Eq Long where - (==) = Java.lcmpeq - (!=) = Java.lcmpne - instance Ord Long where (<) = Java.lcmplt (<=) = Java.lcmple (>) = Java.lcmpgt (>=) = Java.lcmpge - -instance Hashable Long where - hashP v x = Java.l2i (Java.lxor v (Java.lushr v 32)) + x*16777619 instance Additive Long where zero = Java.lconst_0 @@ -747,10 +700,6 @@ importJava "java.lang.Float" where "Converts 32-bit floating point number to a 32-bit integer with the same byte level representation." floatToIntBits :: Float -> Integer -instance Eq Float where - (==) = Java.fcmpeq - (!=) = Java.fcmpne - instance Ord Float where compare = compareFloat (<) = Java.fcmplt @@ -758,9 +707,6 @@ instance Ord Float where (>) = Java.fcmpgt (>=) = Java.fcmpge -instance Hashable Float where - hashP v x = hashP (floatToIntBits v) x - instance Additive Float where zero = Java.fconst_0 (+) = Java.fadd @@ -828,19 +774,12 @@ importJava "java.lang.Double" where isNaN :: Double -> Boolean isInfinite :: Double -> Boolean -instance Eq Double where - (==) = Java.dcmpeq - (!=) = Java.dcmpne - instance Ord Double where compare = compareDouble (<) = Java.dcmplt (<=) = Java.dcmple (>) = Java.dcmpgt - (>=) = Java.dcmpge - -instance Hashable Double where - hashP v x = hashP (doubleToLongBits v) x + (>=) = Java.dcmpge instance Additive Double where zero = Java.dconst_0 @@ -899,10 +838,6 @@ importJava "java.lang.Character" where "Returns true, if the given character is a digit." isDigit :: Character -> Boolean -instance Eq Character where - (==) = Java.ccmpeq - (!=) = Java.ccmpne - instance Ord Character where (<) = Java.ccmplt (<=) = Java.ccmple @@ -1213,10 +1148,6 @@ guard patterns: otherwise :: Boolean otherwise = True -instance Eq Boolean where - a == b = if a then b else not b - a != b = if a then not b else b - instance Ord Boolean where compare False False = 0 compare False True = neg 1 @@ -1269,10 +1200,8 @@ not a = if a then False else True fromJust :: Maybe a -> a fromJust (Just a) = a -deriving instance (Eq a) => Eq (Maybe a) deriving instance (Ord a) => Ord (Maybe a) deriving instance (Show a) => Show (Maybe a) -deriving instance (Hashable a) => Hashable (Maybe a) instance Functor Maybe where fmap _ Nothing = Nothing @@ -1346,10 +1275,8 @@ is used to hold an error value and the `Right` constructor is used to hold a cor """ data Either a b = Left a | Right b -deriving instance (Eq a, Eq b) => Eq (Either a b) deriving instance (Ord a, Ord b) => Ord (Either a b) deriving instance (Show a, Show b) => Show (Either a b) -deriving instance (Hashable a, Hashable b) => Hashable (Either a b) instance Functor (Either a) where fmap _ (Left x) = Left x @@ -1384,12 +1311,6 @@ importJava "java.lang.String" where @JavaName "compareTo" compareString :: String -> String -> Integer @private -// @JavaName "hashCode" -// hashString :: String -> Integer - @private - @JavaName "equals" - equalsString :: String -> String -> Boolean - @private @JavaName "length" lengthString :: String -> Integer @@ -1456,12 +1377,6 @@ importJava "java.lang.String" where @JavaName "" string :: Vector Character -> String -instance Eq String where - (==) = equalsString - -instance Hashable String where - hashP x v = Java.hashCode x + v*16777619 - instance Ord String where compare = compareString @@ -1490,15 +1405,9 @@ split pattern text = arrayToList $ splitString_ text pattern /// Tuple0 /// -instance Eq () where - () == () = True - instance Ord () where compare () () = 0 -instance Hashable () where - hashP () x = x - instance Additive () where zero = () () + () = () @@ -1518,15 +1427,9 @@ fst (x,y) = x snd :: (a,b) -> b snd (x,y) = y -instance (Eq a, Eq b) => Eq (a, b) where - (a0, b0) == (a1, b1) = a0 == a1 && b0 == b1 - instance (Ord a, Ord b) => Ord (a, b) where compare (a0, b0) (a1, b1) = compare a0 a1 &<& compare b0 b1 -instance (Hashable a, Hashable b) => Hashable (a, b) where - hashP (a,b) x = hashP b $ hashP a x - instance (Additive a, Additive b) => Additive (a, b) where zero = (zero, zero) (a0, b0) + (a1, b1) = (a0+a1, b0+b1) @@ -1539,15 +1442,9 @@ instance (Show a, Show b) => Show (a, b) where /// Tuple3 /// -instance (Eq a, Eq b, Eq c) => Eq (a, b, c) where - (a0, b0, c0) == (a1, b1, c1) = a0 == a1 && b0 == b1 && c0 == c1 - instance (Ord a, Ord b, Ord c) => Ord (a, b, c) where compare (a0, b0, c0) (a1, b1, c1) = compare a0 a1 &<& compare b0 b1 &<& compare c0 c1 -instance (Hashable a, Hashable b, Hashable c) => Hashable (a, b, c) where - hashP (a,b,c) x = hashP c $ hashP b $ hashP a x - instance (Additive a, Additive b, Additive c) => Additive (a, b, c) where zero = (zero, zero, zero) (a0, b0, c0) + (a1, b1, c1) = (a0+a1, b0+b1, c0+c1) @@ -1560,16 +1457,10 @@ instance (Show a, Show b, Show c) => Show (a, b, c) where /// Tuple4 /// -instance (Eq a, Eq b, Eq c, Eq d) => Eq (a, b, c, d) where - (a0, b0, c0, d0) == (a1, b1, c1, d1) = a0 == a1 && b0 == b1 && c0 == c1 && d0 == d1 - instance (Ord a, Ord b, Ord c, Ord d) => Ord (a, b, c, d) where compare (a0, b0, c0, d0) (a1, b1, c1, d1) = compare a0 a1 &<& compare b0 b1 &<& compare c0 c1 &<& compare d0 d1 -instance (Hashable a, Hashable b, Hashable c, Hashable d) => Hashable (a, b, c, d) where - hashP (a,b,c,d) x = hashP d $ hashP c $ hashP b $ hashP a x - instance (Additive a, Additive b, Additive c, Additive d) => Additive (a, b, c, d) where zero = (zero, zero, zero, zero) (a0, b0, c0, d0) + (a1, b1, c1, d1) = (a0+a1, b0+b1, c0+c1, d0+d1) @@ -1582,17 +1473,9 @@ instance (Show a, Show b, Show c, Show d) => Show (a, b, c, d) where /// Tuple5 /// -instance (Eq a, Eq b, Eq c, Eq d, Eq e) => Eq (a, b, c, d, e) where - (a0, b0, c0, d0, e0) == (a1, b1, c1, d1, e1) = - a0 == a1 && b0 == b1 && c0 == c1 && d0 == d1 && e0 == e1 - instance (Ord a, Ord b, Ord c, Ord d, Ord e) => Ord (a, b, c, d, e) where compare (a0, b0, c0, d0, e0) (a1, b1, c1, d1, e1) = compare a0 a1 &<& compare b0 b1 &<& compare c0 c1 &<& compare d0 d1 &<& compare e0 e1 - -instance (Hashable a, Hashable b, Hashable c, Hashable d, Hashable e) - => Hashable (a, b, c, d, e) where - hashP (a,b,c,d,e) x = hashP e $ hashP d $ hashP c $ hashP b $ hashP a x instance (Additive a, Additive b, Additive c, Additive d, Additive e) => Additive (a, b, c, d, e) where zero = (zero, zero, zero, zero, zero) @@ -1603,13 +1486,6 @@ instance Functor ((,,,,) a b c d) where /// Lists /// -instance (Eq a) => Eq [a] where - a == b = lA == lB && loop 0 - where - lA = length a - lB = length b - loop i = i>=lA || (a!i == b!i && loop (i+1)) - instance (Ord a) => Ord [a] where compare a b = loop 0 where @@ -1621,14 +1497,6 @@ instance (Ord a) => Ord [a] where then 1 else compare (a!i) (b!i) &<& loop (i+1) -instance (Hashable a) => Hashable [a] where - hashP a x = loop 0 x - where - lA = length a - loop i x = if i == lA - then x - else loop (i+1) (hashP (a!i) x) - instance Functor [] where fmap = mapList @@ -1995,7 +1863,7 @@ importJava "org.simantics.scl.runtime.Lists" where //build :: (forall a. a -> (a -> b -> a) -> a) -> [b] "`elem el lst` return true, if `el` occurs in the list `lst`." -elem :: Eq a => a -> [a] -> Boolean +elem :: a -> [a] -> Boolean elem el l = loop 0 where len = length l @@ -2005,7 +1873,7 @@ elem el l = loop 0 | otherwise = False "`elemMaybe v1 (Just v2)` returns true if `v1 == v2`. `elemMaybe v1 Nothing` is always false." -elemMaybe :: Eq a => a -> Maybe a -> Boolean +elemMaybe :: a -> Maybe a -> Boolean elemMaybe el m = match m with Just el2 -> el == el2 Nothing -> False @@ -2013,7 +1881,7 @@ elemMaybe el m = match m with """ Computes a list that contains only elements that belongs to both input lists. """ -intersect :: Eq a => [a] -> [a] -> [a] +intersect :: [a] -> [a] -> [a] intersect a b = filter f a where f e = elem e b @@ -2044,7 +1912,7 @@ tail l = if len < 2 then emptyList else subList l 1 len len = length l "Tries to find the given key from the list of key-value pairs and returns the corresponding value." -lookup :: Eq a => a -> [(a, b)] -> Maybe b +lookup :: a -> [(a, b)] -> Maybe b lookup el l = do len = length l loop i = if i < len @@ -2118,37 +1986,37 @@ sortBy f l = sortWith (\x y -> compare (f x) (f y)) l Given a list of key-value pairs, the function produces a function that finds a value efficiently for the given key. """ -index :: Hashable a => [(a,b)] -> a -> Maybe b -index = indexWith hash (==) +index :: [(a,b)] -> a -> Maybe b +index = indexWith hashCode (==) """ Given a list of values and a function computing a key for each value, the function produces a function that finds a value effeciently for the given key. """ -indexBy :: Hashable b => (a -> b) -> [a] -> b -> Maybe a +indexBy :: (a -> b) -> [a] -> b -> Maybe a indexBy f l = index [(f x, x) | x <- l] "Groups a list values by a key computed by the given function." -groupBy :: Hashable b => (a -> b) -> [a] -> [(b, [a])] -groupBy f l = groupWith hash (==) f id l +groupBy :: (a -> b) -> [a] -> [(b, [a])] +groupBy f l = groupWith hashCode (==) f id l "Groups a list of key-value pairs by the keys." -group :: Hashable a => [(a,b)] -> [(a, [b])] -group = groupWith hash (==) fst snd +group :: [(a,b)] -> [(a, [b])] +group = groupWith hashCode (==) fst snd "Removes duplicates (all but the first occurrence) from the list but otherwise preserves the order of the elements." -unique :: Eq a => [a] -> [a] +unique :: [a] -> [a] unique = uniqueWith (==) "Like `unique`, but uses the given function for finding the key values used for uniqueness testing." -uniqueBy :: Eq b => (a -> b) -> [a] -> [a] +uniqueBy :: (a -> b) -> [a] -> [a] uniqueBy f = uniqueWith (\a b -> f a == f b) //sortAndUniqueBy :: Ord b => (a -> b) -> [a] -> [a] //sortAndUniqueBy f = map snd . uniqueWith (\a b -> fst a == fst b) . sortBy fst . map (\x -> (f x, x)) "`a \\\\ b` removes all elements of `b` from the list `a`." -(\\) :: Eq a => [a] -> [a] -> [a] +(\\) :: [a] -> [a] -> [a] (\\) = deleteAllBy (==) /// Dynamic /// diff --git a/bundles/org.simantics.scl.runtime/scl/SList.scl b/bundles/org.simantics.scl.runtime/scl/SList.scl index 6622598c7..5233955fe 100644 --- a/bundles/org.simantics.scl.runtime/scl/SList.scl +++ b/bundles/org.simantics.scl.runtime/scl/SList.scl @@ -2,9 +2,7 @@ import "Prelude" data SList a = Nil | Cons a (SList a) -deriving instance (Eq a) => Eq (SList a) deriving instance (Ord a) => Ord (SList a) -deriving instance (Hashable a) => Hashable (SList a) deriving instance (Show a) => Show (SList a) @inline diff --git a/bundles/org.simantics.scl.runtime/scl/Vector.scl b/bundles/org.simantics.scl.runtime/scl/Vector.scl index 51ec078b6..8583875e0 100644 --- a/bundles/org.simantics.scl.runtime/scl/Vector.scl +++ b/bundles/org.simantics.scl.runtime/scl/Vector.scl @@ -165,7 +165,7 @@ mapFirstVector :: (a -> Maybe b) -> Vector a -> Maybe b mapFirstVector f v = mapFirstN (\i -> f (getVector v i)) (lengthVector v) @inline -containsVector :: Eq a => a -> Vector a -> Boolean +containsVector :: a -> Vector a -> Boolean containsVector x v = foldlN (\result i -> result || (v!i == x)) False (lengthVector v) @inline diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/CHRHashIndex.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/CHRHashIndex.java new file mode 100644 index 000000000..d8102b7dd --- /dev/null +++ b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/CHRHashIndex.java @@ -0,0 +1,1616 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.simantics.scl.runtime.chr; + +import static java.util.Arrays.binarySearch; + +import java.util.Arrays; + +/** + * This class is adapted from MutableQHashObjSetGO class generated by Koloboke library. + * It is used by code generated by SCL compiler. + */ +public class CHRHashIndex { + + private static final double MIN_LOAD = 1.0 / 3.0; + private static final double MAX_LOAD = 2.0 / 3.0; + private static final double TARGET_LOAD = 0.5; + private static final double GROWTH_FACTOR = 2.0; + private static final int INITIAL_CAPACITY = 10; + + private static final Object REMOVED = new Object(); + private static final Object FREE = null; + + //////////////////////////// + // Fields + + /** The current number of occupied slots in the hash. */ + private int size; + + private int maxSize; + + /** The current number of free slots in the hash. */ + private int freeSlots; + + private int minFreeSlots; + + private int removedSlots; + + private Object[] set; + + private static int mix(int hash) { + return hash & Integer.MAX_VALUE; + } + + private boolean noRemoved() { + return removedSlots == 0; + } + + /** + * Creates data structures with a prime capacity at or near the minimum + * needed to hold {@code size} elements without triggering a rehash. + * + *
Should be called only in constructors and externalization code. + */ + private void init(int size) { + this.size = 0; + internalInit(targetCapacity(size)); + } + + private void internalInit(int capacity) { + initSlotCounts(capacity); + allocateArrays(capacity); + } + + private void initSlotCounts(int capacity) { + // No sense in trying to rehash after each insertion + // if the capacity is already reached the limit. + maxSize = !isMaxCapacity(capacity) ? maxSize(capacity) : capacity - 1; + minFreeSlots = minFreeSlots(capacity, size, MAX_LOAD, maxSize); + int freeSlots = this.freeSlots = capacity - size; + // free could be less than minFreeSlots only in case when capacity + // is not sufficient to comply load factor (due to saturation with + // Java array size limit). Set minFreeSlots to a half of free to avoid + // too often (instant) rehashing in this case. + if (freeSlots < minFreeSlots) this.minFreeSlots = (freeSlots + 1) / 2; + removedSlots = 0; + } + + private static int minFreeSlots(int capacity, int size, double maxLoad, int maxSize) { + double load = (double) size / (double) capacity; + // See "Tombstones purge from hashtable: theory and practice" wiki page + double rehashLoad = + 0.55 + 0.721 * load - 0.274 * load * load; + + int minFreeSlots; + // minFreeSlots shouldn't be less than `capacity - maxSize` + if (rehashLoad > maxLoad) { + minFreeSlots = (int) ((double) capacity * (1.0 - rehashLoad)); + } else { + minFreeSlots = capacity - maxSize; + } + // Need at least one free slot for open addressing + return minFreeSlots > 0 ? minFreeSlots : 1; + } + + ///////////////////////////// + // Modification hooks and rehash logic + + public boolean shrink() { + int newCapacity = targetCapacity(size); + if (removedSlots > 0 || newCapacity < set.length) { + rehash(newCapacity); + return true; + } else { + return false; + } + } + + private boolean tryRehashForExpansion(int newCapacity) { + // No sense in rehashing for expansion if we already reached Java array + // size limit. + if (newCapacity > set.length || removedSlots > 0) { + rehash(newCapacity); + return true; + } else { + if (freeSlots < minFreeSlots) + minFreeSlots = (freeSlots + 1) / 2; + return false; + } + } + + public boolean ensureCapacity(long minSize) { + int intMinSize = (int) Math.min(minSize, (long) Integer.MAX_VALUE); + if (minSize < 0L) + throw new IllegalArgumentException( + "Min size should be positive, " + minSize + " given."); + int additionalSize = intMinSize - size; + if (additionalSize <= 0) + return false; + if (intMinSize > maxSize || freeSlots - additionalSize < minFreeSlots) { + return tryRehashForExpansion(targetCapacity(intMinSize)); + } else { + return false; + } + } + + private void postRemoveHook() { + size--; + removedSlots++; + } + + private void postFreeSlotInsertHook() { + if (++size > maxSize) { + if (tryRehashForExpansion(grownCapacity())) + return; + } + if (--freeSlots < minFreeSlots) { + if (!tryRehashIfTooFewFreeSlots() && freeSlots == 0) { + throw new CHRHashOverflowException(); + } + } + } + + private void postRemovedSlotInsertHook() { + if (++size > maxSize) { + if (tryRehashForExpansion(grownCapacity())) + return; + } + removedSlots--; + } + + private boolean tryRehashIfTooFewFreeSlots() { + if (removedSlots > 0) { + rehash(targetCapacity(size)); + return true; + } else { + return tryRehashForExpansion(grownCapacity()); + } + } + + /** For initial hash table construction and rehash to target load (shrink, tombstones purge). */ + private int targetCapacity(int size) { + return capacity(size, targetLoadInverse.scaleUpper(size)); + } + + /** The highest qHash prime below Integer.MAX_VALUE (which is a qHash prime too). */ + private static final int MAX_INT_CAPACITY = 2147483587; + + + private boolean isMaxCapacity(int capacity) { + return capacity >= MAX_INT_CAPACITY; + } + + private int grownCapacity() { + return nearestGreaterCapacity(grow(set.length), size); + } + + protected boolean keyEquals(Object a, Object b) { + return a.equals(b); + } + + protected int keyHashCode(Object key) { + return key.hashCode(); + } + + + public boolean contains(Object key) { + return index(key) >= 0; + } + + private int index(Object key) { + // noinspection unchecked + Object[] keys = set; + int capacity, index; + Object cur; + if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) == key) { + // key is present + return index; + } else { + if (cur == FREE) { + // key is absent, free slot + return -1; + } else { + if (cur != REMOVED) { + if (keyEquals(key, cur)) { + // key is present + return index; + } else { + if (noRemoved()) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == key) { + // key is present + return bIndex; + } else if (cur == FREE) { + // key is absent, free slot + return -1; + } + else if (keyEquals(key, cur)) { + // key is present + return bIndex; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == key) { + // key is present + return fIndex; + } else if (cur == FREE) { + // key is absent, free slot + return -1; + } + else if (keyEquals(key, cur)) { + // key is present + return fIndex; + } + step += 2; + } + } + } + } + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == key) { + // key is present + return bIndex; + } else if (cur == FREE) { + // key is absent, free slot + return -1; + } + else if (cur != REMOVED && keyEquals(key, cur)) { + // key is present + return bIndex; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == key) { + // key is present + return fIndex; + } else if (cur == FREE) { + // key is absent, free slot + return -1; + } + else if (cur != REMOVED && keyEquals(key, cur)) { + // key is present + return fIndex; + } + step += 2; + } + } + } + } + + private void allocateArrays(int capacity) { + set = new Object[capacity]; + // not necessary because FREE = null + // Arrays.fill(set, FREE); + } + + + public Object[] toArray() { + Object[] result = new Object[size]; + if (size == 0) + return result; + int resultIndex = 0; + Object[] keys = set; + if (noRemoved()) { + for (int i = keys.length - 1; i >= 0; i--) { + Object key; + // noinspection unchecked + if ((key = keys[i]) != FREE) { + result[resultIndex++] = key; + } + } + } else { + for (int i = keys.length - 1; i >= 0; i--) { + Object key; + // noinspection unchecked + if ((key = keys[i]) != FREE && key != REMOVED) { + result[resultIndex++] = key; + } + } + } + return result; + } + + @SuppressWarnings("unchecked") + public T[] toArray(T[] a) { + if (a.length < size) { + Class elementType = a.getClass().getComponentType(); + a = (T[]) java.lang.reflect.Array.newInstance(elementType, size); + } + if (size == 0) { + if (a.length > 0) + a[0] = null; + return a; + } + int resultIndex = 0; + Object[] keys = set; + if (noRemoved()) { + for (int i = keys.length - 1; i >= 0; i--) { + Object key; + // noinspection unchecked + if ((key = keys[i]) != FREE) { + a[resultIndex++] = (T) key; + } + } + } else { + for (int i = keys.length - 1; i >= 0; i--) { + Object key; + // noinspection unchecked + if ((key = keys[i]) != FREE && key != REMOVED) { + a[resultIndex++] = (T) key; + } + } + } + if (a.length > resultIndex) + a[resultIndex] = null; + return a; + } + + private void rehash(int newCapacity) { + Object[] keys = set; + int removedSlots = this.removedSlots; + internalInit(newCapacity); + Object[] newKeys = set; + int capacity = newKeys.length; + if (removedSlots == 0) { + for (int i = keys.length - 1; i >= 0; i--) { + Object key; + // noinspection unchecked + if ((key = keys[i]) != FREE) { + int index; + if (newKeys[index = mix(keyHashCode(key)) % capacity] != FREE) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if (newKeys[bIndex] == FREE) { + index = bIndex; + break; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if (newKeys[fIndex] == FREE) { + index = fIndex; + break; + } + step += 2; + } + } + newKeys[index] = key; + } + } + } else { + for (int i = keys.length - 1; i >= 0; i--) { + Object key; + // noinspection unchecked + if ((key = keys[i]) != FREE && key != REMOVED) { + int index; + if (newKeys[index = mix(keyHashCode(key)) % capacity] != FREE) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if (newKeys[bIndex] == FREE) { + index = bIndex; + break; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if (newKeys[fIndex] == FREE) { + index = fIndex; + break; + } + step += 2; + } + } + newKeys[index] = key; + } + } + } + } + + public void clear() { + size = 0; + freeSlots = set.length; + removedSlots = 0; + Arrays.fill(set, FREE); + } + + + public CHRHashIndex() { + init(INITIAL_CAPACITY); + } + + public boolean add(Object key) { + Object[] keys = set; + int capacity, index; + Object cur; + keyAbsentFreeSlot: + if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) != FREE) { + if (cur == key) { + // key is present + return false; + } else { + int firstRemoved; + if (cur != REMOVED) { + if (!keyEquals(key, cur)) { + if (noRemoved()) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) { + index = bIndex; + break keyAbsentFreeSlot; + } else if (cur == key || (keyEquals(key, cur))) { + // key is present + return false; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) { + index = fIndex; + break keyAbsentFreeSlot; + } else if (cur == key || (keyEquals(key, cur))) { + // key is present + return false; + } + step += 2; + } + } else { + firstRemoved = -1; + } + } else { + // key is present + return false; + } + } else { + firstRemoved = index; + } + keyAbsentRemovedSlot: { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) { + if (firstRemoved < 0) { + index = bIndex; + break keyAbsentFreeSlot; + } else { + break keyAbsentRemovedSlot; + } + } else if (cur == key) { + // key is present + return false; + } else if (cur != REMOVED) { + if (keyEquals(key, cur)) { + // key is present + return false; + } + } else if (firstRemoved < 0) { + firstRemoved = bIndex; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) { + if (firstRemoved < 0) { + index = fIndex; + break keyAbsentFreeSlot; + } else { + break keyAbsentRemovedSlot; + } + } else if (cur == key) { + // key is present + return false; + } else if (cur != REMOVED) { + if (keyEquals(key, cur)) { + // key is present + return false; + } + } else if (firstRemoved < 0) { + firstRemoved = fIndex; + } + step += 2; + } + } + // key is absent, removed slot + keys[firstRemoved] = key; + postRemovedSlotInsertHook(); + return true; + } + } + // key is absent, free slot + keys[index] = key; + postFreeSlotInsertHook(); + return true; + } + + /** + * Assumes that the given value doesn't already exist in the index + * (only optimized with this assumption, the method works correctly + * even if the assumption does not hold). + * Returns the old equal element that the given value replaces or + * null if there is no such elements. + */ + public Object addFreshAndReturnOld(Object key) { + Object[] keys = set; + int capacity, index; + Object cur; + keyAbsentFreeSlot: if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) != FREE) { + int firstRemoved; + if (cur != REMOVED) { + if (!keyEquals(key, cur)) { + if (noRemoved()) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) { + index = bIndex; + break keyAbsentFreeSlot; + } else if (keyEquals(key, cur)) { + keys[bIndex] = key; + return cur; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) { + index = fIndex; + break keyAbsentFreeSlot; + } else if (keyEquals(key, cur)) { + keys[fIndex] = key; + return cur; + } + step += 2; + } + } else { + firstRemoved = -1; + } + } else { + keys[index] = key; + return cur; + } + } else { + firstRemoved = index; + } + keyAbsentRemovedSlot: { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) { + if (firstRemoved < 0) { + index = bIndex; + break keyAbsentFreeSlot; + } else { + break keyAbsentRemovedSlot; + } + } else if (cur != REMOVED) { + if (keyEquals(key, cur)) { + keys[bIndex] = key; + return cur; + } + } else if (firstRemoved < 0) { + firstRemoved = bIndex; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) { + if (firstRemoved < 0) { + index = fIndex; + break keyAbsentFreeSlot; + } else { + break keyAbsentRemovedSlot; + } + } else if (cur != REMOVED) { + if (keyEquals(key, cur)) { + keys[fIndex] = key; + return cur; + } + } else if (firstRemoved < 0) { + firstRemoved = fIndex; + } + step += 2; + } + } + // key is absent, removed slot + keys[firstRemoved] = key; + postRemovedSlotInsertHook(); + return null; + } + // key is absent, free slot + keys[index] = key; + postFreeSlotInsertHook(); + return null; + } + + public Object addFreshAndReturnOldNoRemovals(Object key) { + Object[] keys = set; + int capacity, index; + Object cur; + keyAbsentFreeSlot: if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) != FREE) { + if (!keyEquals(key, cur)) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) { + index = bIndex; + break keyAbsentFreeSlot; + } else if (keyEquals(key, cur)) { + keys[bIndex] = key; + return cur; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) { + index = fIndex; + break keyAbsentFreeSlot; + } else if (keyEquals(key, cur)) { + keys[fIndex] = key; + return cur; + } + step += 2; + } + } else { + keys[index] = key; + return cur; + } + } + // key is absent, free slot + keys[index] = key; + postFreeSlotInsertHook(); + return null; + } + + public boolean remove(Object key) { + // noinspection unchecked + Object[] keys = set; + int capacity, index; + Object cur; + keyPresent: + if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) != key) { + if (cur == FREE) { + // key is absent, free slot + return false; + } else { + if (cur != REMOVED) { + if (keyEquals(key, cur)) { + break keyPresent; + } else { + if (noRemoved()) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == key) { + index = bIndex; + break keyPresent; + } else if (cur == FREE) { + // key is absent, free slot + return false; + } + else if (keyEquals(key, cur)) { + index = bIndex; + break keyPresent; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == key) { + index = fIndex; + break keyPresent; + } else if (cur == FREE) { + // key is absent, free slot + return false; + } + else if (keyEquals(key, cur)) { + index = fIndex; + break keyPresent; + } + step += 2; + } + } + } + } + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == key) { + index = bIndex; + break keyPresent; + } else if (cur == FREE) { + // key is absent, free slot + return false; + } + else if (cur != REMOVED && keyEquals(key, cur)) { + index = bIndex; + break keyPresent; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == key) { + index = fIndex; + break keyPresent; + } else if (cur == FREE) { + // key is absent, free slot + return false; + } + else if (cur != REMOVED && keyEquals(key, cur)) { + index = fIndex; + break keyPresent; + } + step += 2; + } + } + } + // key is present + keys[index] = REMOVED; + postRemoveHook(); + return true; + } + + /** + * Assumes that the key exists in the index. Removes it. + */ + public void removeKnownToExistKey(Object key) { + Object[] keys = set; + int capacity, index; + keyPresent: if (keys[index = mix(keyHashCode(key)) % (capacity = keys.length)] != key) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if (keys[bIndex] == key) { + index = bIndex; + break keyPresent; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if (keys[fIndex] == key) { + index = fIndex; + break keyPresent; + } + step += 2; + } + } + keys[index] = REMOVED; + postRemoveHook(); + } + + /** + * Assumes that the key exists in the index. Replaces it with an equal key. + */ + public void replaceKnownToExistKey(Object key, Object replacement) { + Object[] keys = set; + int capacity, index; + keyPresent: if (keys[index = mix(keyHashCode(key)) % (capacity = keys.length)] != key) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if (keys[bIndex] == key) { + index = bIndex; + break keyPresent; + } + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if (keys[fIndex] == key) { + index = fIndex; + break keyPresent; + } + step += 2; + } + } + keys[index] = replacement; + } + + public Object getEqual(Object key) { + // noinspection unchecked + Object[] keys = set; + int capacity, index; + Object cur; + if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) == FREE) + return null; + if (cur != REMOVED) { + if (keyEquals(key, cur)) + return cur; + if (noRemoved()) { + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) + return null; + else if (keyEquals(key, cur)) + return cur; + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) + return null; + else if (keyEquals(key, cur)) + return cur; + step += 2; + } + } + } + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) + return null; + else if (cur != REMOVED && keyEquals(key, cur)) + return cur; + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) + return null; + else if (cur != REMOVED && keyEquals(key, cur)) + return cur; + step += 2; + } + } + + public Object getEqualNoRemovals(Object key) { + Object[] keys = set; + int capacity, index; + Object cur; + if ((cur = keys[index = mix(keyHashCode(key)) % (capacity = keys.length)]) == FREE) + return null; + if (keyEquals(key, cur)) + return cur; + int bIndex = index, fIndex = index, step = 1; + while (true) { + if ((bIndex -= step) < 0) bIndex += capacity; + if ((cur = keys[bIndex]) == FREE) + return null; + else if (keyEquals(key, cur)) + return cur; + int t; + if ((t = (fIndex += step) - capacity) >= 0) fIndex = t; + if ((cur = keys[fIndex]) == FREE) + return null; + else if (keyEquals(key, cur)) + return cur; + step += 2; + } + } + + private static final Scaler minLoadInverse = Scaler.by(1.0 / MIN_LOAD); + private static final Scaler targetLoadInverse = Scaler.by(1.0 / TARGET_LOAD); + private static final Scaler maxLoad = Scaler.by(MAX_LOAD); + private static final Scaler maxLoadInverse = Scaler.by(1.0 / MAX_LOAD); + private static final Scaler growthFactor = Scaler.by(GROWTH_FACTOR); + + /** + * Computes hash table capacity for the given size and min load of this config. + * + * @param size size of the hash table to compute capacity for + * @return if the given size is non-negative, returns the least int capacity such that + * size / capacity < {@code config().getMinLoad()}, or {@code Integer.MAX_VALUE} + * if there is no such capacity. If size is negative, result is undefined. + */ + private static int maxCapacity(int size) { + return minLoadInverse.scaleUpper(size); + } + + /** + * Computes hash table capacity for the given size and max load of this config. + * + * @param size size of the hash table to compute capacity for + * @return if the given size is non-negative, returns the least int capacity such that + * size / capacity < {@code config().getMaxLoad()}, or {@code Integer.MAX_VALUE} + * if there is no such capacity. If size is negative, result is undefined. + */ + private static int minCapacity(int size) { + return maxLoadInverse.scaleUpper(size); + } + + private static int maxSize(int capacity) { + return maxLoad.scaleLower(capacity); + } + + /** + * Computes grown hash table capacity for the given capacity and growth factor of this config. + * + * @param capacity capacity of the hash table to grow + * @return if the given capacity is non-negative, returns the least int capacity + * such that |new capacity - the given capacity * {@code config().getGrowthFactor()}| < + * 1, or {@code Integer.MAX_VALUE} if there is no such capacity. + * If the given capacity is negative, result is undefined. + */ + private static int grow(int capacity) { + return growthFactor.scaleLower(capacity); + } + + /** + * Chooses lesser or greater capacity, which one is better for the given {@code size} and + * hash config. (The {@code desiredCapacity} is just precomputed + * {@code conf.targetCapacity(size)}). + * + *
Chooses the capacity which is closer to the {@code desiredCapacity} and conform min or + * max capacity bounds for the given {@code size} and hash config. + * + *
If both {@code lesserCapacity} and {@code greaterCapacity} are out of these bounds, + * {@code onFail} value is returned. + * + * @param conf the {@code HashConfigWrapper} + * @param size should be non-negative + * @param desiredCapacity precomputed {@code conf.targetCapacity(size)} + * @param lesserCapacity should be greater than the {@code size} but lesser + * than the {@code desiredCapacity} + * @param greaterCapacity should be greater than the {@code desiredCapacity} + * @param onFail the value to return if both {@code lesserCapacity} and {@code greaterCapacity} + * are lesser than min size and greater than max size respectively + * for the given hash config and size + * @return {@code lesserCapacity} or {@code greaterCapacity} + * @see #chooseBetter(HashConfigWrapper, long, long, long, long, long) + */ + private static int chooseBetter(int size, + int desiredCapacity, int lesserCapacity, int greaterCapacity, int onFail) { + assert 0 <= size; + assert size < lesserCapacity && lesserCapacity < desiredCapacity; + assert desiredCapacity < greaterCapacity; + if (greaterCapacity - desiredCapacity <= desiredCapacity - lesserCapacity && + greaterCapacity <= maxCapacity(size)) { + return greaterCapacity; + } + return lesserCapacity >= minCapacity(size) ? lesserCapacity : onFail; + } + + private static int capacity(int size, int desiredCapacity) { + int lesserCapacity, greaterCapacity; + if (desiredCapacity <= MAX_LOOKUP_CAPACITY) { + int smallTableIndex = SMALL_LOOKUP_TABLE_INDICES[desiredCapacity]; + greaterCapacity = SMALL_LOOKUP_TABLE_CAPACITIES[smallTableIndex]; + if (greaterCapacity == desiredCapacity || smallTableIndex == 0) + return greaterCapacity; + lesserCapacity = SMALL_LOOKUP_TABLE_CAPACITIES[smallTableIndex - 1]; + } + else if (desiredCapacity <= MAX_REGULAR_CHAR_CAPACITY) { + int capIndex = binarySearch(REGULAR_CHAR_CAPACITIES, (char) desiredCapacity); + if (capIndex >= 0) // desiredCapacity is found in REGULAR_CHAR_CAPACITIES + return desiredCapacity; + capIndex = ~capIndex; + lesserCapacity = capIndex > 0 ? + (int) REGULAR_CHAR_CAPACITIES[capIndex - 1] : MAX_LOOKUP_CAPACITY; + greaterCapacity = REGULAR_CHAR_CAPACITIES[capIndex]; + } + else if (desiredCapacity <= MAX_REGULAR_INT_CAPACITY) { + int capIndex = binarySearch(REGULAR_INT_CAPACITIES, desiredCapacity); + if (capIndex >= 0) // desiredCapacity is found in REGULAR_INT_CAPACITIES + return desiredCapacity; + capIndex = ~capIndex; + lesserCapacity = capIndex > 0 ? + REGULAR_INT_CAPACITIES[capIndex - 1] : MAX_REGULAR_CHAR_CAPACITY; + greaterCapacity = REGULAR_INT_CAPACITIES[capIndex]; + } + else { + // Since size could be virtual (expected), don't prematurely throw + // HashOverflowException. If sizes near to Integer.MAX_VALUE is the case, + // version accepting long size should be used. + return MAX_INT_CAPACITY; + } + return chooseBetter(size, desiredCapacity, lesserCapacity, greaterCapacity, + greaterCapacity); + } + + /** For grow rehash. */ + private static int nearestGreaterCapacity(int desiredCapacity, int currentSize) { + assert currentSize >= 0 : "currentSize must be non-negative"; + if (desiredCapacity <= MAX_LOOKUP_CAPACITY) + return SMALL_LOOKUP_TABLE_CAPACITIES[SMALL_LOOKUP_TABLE_INDICES[desiredCapacity]]; + if (desiredCapacity <= MAX_REGULAR_CHAR_CAPACITY) { + int capIndex = binarySearch(REGULAR_CHAR_CAPACITIES, (char) desiredCapacity); + // capIndex >= 0 => desiredCapacity IS a regular capacity + return capIndex < 0 ? REGULAR_CHAR_CAPACITIES[~capIndex] : desiredCapacity; + } + final boolean simpleArrays = true; + if (desiredCapacity <= MAX_REGULAR_INT_CAPACITY) { + int capIndex = binarySearch(REGULAR_INT_CAPACITIES, desiredCapacity); + return capIndex < 0 ? REGULAR_INT_CAPACITIES[~capIndex] : desiredCapacity; + } + int maxCapacity = MAX_INT_CAPACITY; + // overflow-aware + if (currentSize - maxCapacity < 0) + return maxCapacity; + if (simpleArrays && currentSize - Integer.MAX_VALUE < 0) { + // Integer.MAX_VALUE is also a qHash prime, but likely will cause OutOfMemoryError + return Integer.MAX_VALUE; + } else { + // QHash must have at least 1 free slot + throw new CHRHashOverflowException(); + } + } + + private static final char[] SMALL_LOOKUP_TABLE_CAPACITIES = new char[] { + 7, 11, 19, 23, 31, 43, 47, 59, 67, 71, + 79, 83, 103, 107, 127, 131, 139, 151, 163, 167, + 179, 191, 199, 211, 223, 227, 239, 251, 263, 271, + 283, 307, 311, 331, 347, 359, 367, 379, 383, 419, + 431, 439, 443, 463, 467, 479, 487, 491, 499, 503, + 523, 547, 563, 571, 587, 599, 607, 619, 631, 643, + 647, 659, 683, 691, 719, 727, 739, 743, 751, 787, + 811, 823, 827, 839, 859, 863, 883, 887, 907, 911, + 919, 947, 967, 971, 983, 991, 1019 + }; + + private static final byte[] SMALL_LOOKUP_TABLE_INDICES = new byte[] { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, + 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, + 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, + 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, + 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, + 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, + 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, + 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, + 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, + 42, 42, 42, 42, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 44, 44, 44, 44, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 46, 46, 46, 46, 46, 46, 46, 46, 47, 47, + 47, 47, 48, 48, 48, 48, 48, 48, 48, 48, + 49, 49, 49, 49, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, + 53, 53, 54, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 60, 60, 60, 60, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, + 63, 63, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 65, 65, 65, 65, 65, 65, 65, 65, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 67, 67, 67, 67, 68, 68, 68, 68, 68, 68, + 68, 68, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, + 70, 70, 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 72, 72, 72, 72, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 75, 75, 75, 75, 76, 76, 76, 76, 76, 76, + 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, + 76, 76, 76, 76, 77, 77, 77, 77, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, + 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 83, 83, + 83, 83, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 85, 85, 85, 85, 85, 85, + 85, 85, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86 + }; + + /** Compile-time constant expression */ + private static final int MAX_LOOKUP_CAPACITY = 1019; + static { + if (MAX_LOOKUP_CAPACITY != + SMALL_LOOKUP_TABLE_CAPACITIES[SMALL_LOOKUP_TABLE_CAPACITIES.length - 1]) { + throw new AssertionError(); + } + } + + /** + * These capacities and other regular capacities from {@link #REGULAR_INT_CAPACITIES} + * and {@link #REGULAR_LONG_CAPACITIES} arrays are generated using a single command + * {@code $ java QHashCapacities 40 0.005}, i. e. trying to keep 0.5% max difference between + * neighbouring capacities. + * + * @see {@link #main(String[])} + * @see {@link #generateRegularCapacities(long, double)} + */ + private static final char[] REGULAR_CHAR_CAPACITIES = new char[] { + 1031, 1039, + 1051, 1063, 1087, 1091, 1103, 1123, 1151, 1163, 1171, 1187, + 1223, 1231, 1259, 1279, 1283, 1291, 1303, 1307, 1319, 1327, + 1367, 1399, 1423, 1427, 1439, 1447, 1451, 1459, 1471, 1483, + 1487, 1499, 1511, 1523, 1531, 1543, 1559, 1567, 1571, 1579, + 1583, 1607, 1619, 1627, 1663, 1667, 1699, 1723, 1747, 1759, + 1783, 1787, 1811, 1823, 1831, 1847, 1867, 1871, 1879, 1907, + 1931, 1951, 1979, 1987, 1999, 2003, 2011, 2027, 2039, 2063, + 2083, 2087, 2099, 2111, 2131, 2143, 2179, 2203, 2207, 2239, + 2243, 2251, 2267, 2287, 2311, 2339, 2347, 2351, 2371, 2383, + 2399, 2411, 2423, 2447, 2459, 2467, 2503, 2531, 2539, 2543, + 2551, 2579, 2591, 2647, 2659, 2663, 2671, 2683, 2687, 2699, + 2707, 2711, 2719, 2731, 2767, 2791, 2803, 2819, 2843, 2851, + 2879, 2887, 2903, 2927, 2939, 2963, 2971, 2999, 3011, 3019, + 3023, 3067, 3079, 3083, 3119, 3163, 3167, 3187, 3191, 3203, + 3251, 3259, 3271, 3299, 3307, 3319, 3323, 3331, 3343, 3347, + 3359, 3371, 3391, 3407, 3463, 3467, 3491, 3499, 3511, 3527, + 3539, 3547, 3559, 3571, 3583, 3607, 3623, 3631, 3643, 3659, + 3671, 3691, 3719, 3727, 3739, 3767, 3779, 3803, 3823, 3847, + 3851, 3863, 3907, 3911, 3919, 3923, 3931, 3943, 3947, 3967, + 4003, 4007, 4019, 4027, 4051, 4079, 4091, 4099, 4111, 4127, + 4139, 4159, 4211, 4219, 4231, 4243, 4259, 4271, 4283, 4327, + 4339, 4363, 4391, 4423, 4447, 4451, 4463, 4483, 4507, 4519, + 4523, 4547, 4567, 4583, 4591, 4603, 4639, 4643, 4651, 4663, + 4679, 4691, 4703, 4723, 4751, 4759, 4783, 4787, 4799, 4831, + 4871, 4903, 4919, 4931, 4943, 4951, 4967, 4987, 4999, 5003, + 5011, 5023, 5039, 5051, 5059, 5087, 5099, 5107, 5119, 5147, + 5167, 5171, 5179, 5227, 5231, 5279, 5303, 5323, 5347, 5351, + 5387, 5399, 5407, 5419, 5431, 5443, 5471, 5479, 5483, 5503, + 5507, 5519, 5527, 5531, 5563, 5591, 5623, 5639, 5647, 5651, + 5659, 5683, 5711, 5743, 5779, 5783, 5791, 5807, 5827, 5839, + 5843, 5851, 5867, 5879, 5903, 5923, 5927, 5939, 5987, 6007, + 6011, 6043, 6047, 6067, 6079, 6091, 6131, 6143, 6151, 6163, + 6199, 6203, 6211, 6247, 6263, 6271, 6287, 6299, 6311, 6323, + 6343, 6359, 6367, 6379, 6427, 6451, 6491, 6547, 6551, 6563, + 6571, 6599, 6607, 6619, 6659, 6679, 6691, 6703, 6719, 6763, + 6779, 6791, 6803, 6823, 6827, 6863, 6871, 6883, 6899, 6907, + 6911, 6947, 6959, 6967, 6971, 6983, 6991, 7019, 7027, 7039, + 7043, 7079, 7103, 7127, 7151, 7159, 7187, 7207, 7211, 7219, + 7243, 7247, 7283, 7307, 7331, 7351, 7411, 7451, 7459, 7487, + 7499, 7507, 7523, 7547, 7559, 7583, 7591, 7603, 7607, 7639, + 7643, 7687, 7691, 7699, 7703, 7723, 7727, 7759, 7823, 7867, + 7879, 7883, 7907, 7919, 7927, 7951, 7963, 8011, 8039, 8059, + 8087, 8111, 8123, 8147, 8167, 8171, 8179, 8191, 8219, 8231, + 8243, 8263, 8287, 8291, 8311, 8363, 8387, 8419, 8423, 8431, + 8443, 8447, 8467, 8527, 8539, 8543, 8563, 8599, 8623, 8627, + 8647, 8663, 8699, 8707, 8719, 8731, 8747, 8779, 8783, 8803, + 8807, 8819, 8831, 8839, 8863, 8867, 8887, 8923, 8951, 8963, + 8971, 8999, 9007, 9011, 9043, 9059, 9067, 9091, 9103, 9127, + 9151, 9187, 9199, 9203, 9227, 9239, 9283, 9311, 9319, 9323, + 9343, 9371, 9391, 9403, 9419, 9431, 9439, 9463, 9467, 9479, + 9491, 9511, 9539, 9547, 9551, 9587, 9619, 9623, 9631, 9643, + 9679, 9719, 9739, 9743, 9767, 9787, 9791, 9803, 9811, 9839, + 9851, 9859, 9871, 9883, 9887, 9907, 9923, 9931, 9967, 10007, + 10039, 10067, 10079, 10091, 10099, 10103, 10111, 10139, 10151, 10159, + 10163, 10211, 10223, 10243, 10247, 10259, 10267, 10271, 10303, 10331, + 10343, 10391, 10399, 10427, 10459, 10463, 10487, 10499, 10531, 10559, + 10567, 10607, 10627, 10631, 10639, 10651, 10663, 10667, 10687, 10691, + 10711, 10723, 10739, 10771, 10799, 10831, 10847, 10859, 10867, 10883, + 10891, 10903, 10939, 10979, 10987, 11003, 11027, 11047, 11059, 11071, + 11083, 11087, 11119, 11131, 11159, 11171, 11239, 11243, 11251, 11279, + 11287, 11299, 11311, 11351, 11383, 11399, 11411, 11423, 11443, 11447, + 11467, 11471, 11483, 11491, 11503, 11519, 11527, 11551, 11579, 11587, + 11699, 11719, 11731, 11743, 11779, 11783, 11807, 11827, 11831, 11839, + 11863, 11867, 11887, 11903, 11923, 11927, 11939, 11959, 11971, 11987, + 12007, 12011, 12043, 12071, 12107, 12119, 12143, 12163, 12203, 12211, + 12227, 12239, 12251, 12263, 12323, 12343, 12347, 12379, 12391, 12451, + 12479, 12487, 12491, 12503, 12511, 12527, 12539, 12547, 12583, 12611, + 12619, 12647, 12659, 12671, 12703, 12739, 12743, 12763, 12791, 12799, + 12823, 12899, 12919, 12979, 13043, 13099, 13159, 13219, 13259, 13291, + 13339, 13399, 13463, 13523, 13567, 13619, 13679, 13711, 13763, 13831, + 13879, 13931, 13999, 14051, 14083, 14143, 14207, 14243, 14303, 14323, + 14387, 14431, 14503, 14563, 14627, 14683, 14723, 14779, 14851, 14923, + 14983, 15031, 15083, 15131, 15187, 15259, 15307, 15383, 15439, 15511, + 15551, 15607, 15667, 15727, 15787, 15859, 15919, 15991, 16063, 16111, + 16187, 16267, 16339, 16411, 16427, 16487, 16547, 16619, 16691, 16747, + 16811, 16879, 16963, 17047, 17123, 17207, 17291, 17359, 17443, 17519, + 17579, 17659, 17747, 17807, 17891, 17959, 18043, 18119, 18199, 18287, + 18367, 18427, 18503, 18583, 18671, 18719, 18787, 18839, 18899, 18959, + 19051, 19139, 19231, 19319, 19379, 19423, 19507, 19603, 19687, 19751, + 19843, 19927, 20023, 20123, 20219, 20287, 20347, 20443, 20543, 20611, + 20707, 20807, 20879, 20939, 21011, 21107, 21179, 21283, 21379, 21467, + 21559, 21647, 21739, 21839, 21943, 22039, 22147, 22247, 22343, 22447, + 22531, 22639, 22751, 22859, 22943, 23027, 23131, 23227, 23339, 23447, + 23563, 23663, 23767, 23879, 23971, 24043, 24151, 24239, 24359, 24379, + 24499, 24571, 24683, 24799, 24907, 25031, 25111, 25219, 25339, 25463, + 25579, 25679, 25799, 25903, 25999, 26099, 26227, 26339, 26407, 26539, + 26627, 26759, 26879, 27011, 27143, 27271, 27407, 27527, 27631, 27751, + 27883, 28019, 28151, 28279, 28387, 28499, 28619, 28751, 28879, 29023, + 29167, 29303, 29443, 29587, 29723, 29851, 29983, 30119, 30259, 30391, + 30539, 30671, 30803, 30931, 31079, 31231, 31387, 31543, 31699, 31847, + 31963, 32099, 32251, 32371, 32531, 32687, 32839, 32887, 33023, 33179, + 33331, 33479, 33647, 33811, 33967, 34123, 34231, 34403, 34543, 34703, + 34871, 35023, 35171, 35339, 35507, 35671, 35803, 35951, 36131, 36299, + 36451, 36587, 36767, 36943, 37123, 37307, 37447, 37619, 37799, 37987, + 38167, 38351, 38543, 38671, 38851, 39043, 39227, 39419, 39607, 39779, + 39971, 40151, 40343, 40499, 40699, 40847, 41039, 41243, 41443, 41647, + 41843, 41983, 42179, 42359, 42571, 42743, 42943, 43151, 43331, 43543, + 43759, 43943, 44131, 44351, 44563, 44771, 44959, 45179, 45403, 45599, + 45823, 46051, 46271, 46471, 46687, 46919, 47111, 47339, 47563, 47791, + 48023, 48259, 48491, 48731, 48947, 49171, 49391, 49627, 49871, 50111, + 50359, 50587, 50839, 51031, 51263, 51511, 51767, 52027, 52259, 52511, + 52747, 53003, 53267, 53527, 53791, 54059, 54311, 54583, 54851, 55079, + 55331, 55579, 55843, 56123, 56383, 56659, 56911, 57191, 57467, 57719, + 57991, 58271, 58543, 58831, 59107, 59387, 59659, 59951, 60251, 60527, + 60811, 61091, 61379, 61687, 61991, 62299, 62591, 62903, 63179, 63487, + 63803, 64123, 64439, 64747, 65063, 65371 + }; + + /** Compile-time constant expression */ + private static final int MAX_REGULAR_CHAR_CAPACITY = 65371; + static { + if (MAX_REGULAR_CHAR_CAPACITY != + REGULAR_CHAR_CAPACITIES[REGULAR_CHAR_CAPACITIES.length - 1]) + throw new AssertionError(); + } + + + private static final int[] REGULAR_INT_CAPACITIES = new int[] { + 65687, 65827, 66103, 66431, + 66751, 67079, 67391, 67699, 68023, 68351, 68687, 69031, 69371, 69691, + 69991, 70327, 70627, 70979, 71327, 71647, 71947, 72271, 72623, 72931, + 73291, 73643, 73999, 74323, 74687, 75011, 75367, 75731, 76091, 76463, + 76819, 77167, 77527, 77899, 78259, 78607, 78979, 79319, 79687, 80039, + 80407, 80803, 81203, 81611, 82003, 82387, 82787, 83203, 83563, 83891, + 84299, 84691, 85103, 85523, 85931, 86351, 86783, 87211, 87643, 88079, + 88499, 88919, 89363, 89759, 90187, 90631, 91079, 91499, 91939, 92399, + 92863, 93307, 93763, 94219, 94687, 95131, 95603, 96059, 96527, 96979, + 97459, 97919, 98387, 98867, 99347, 99823, 100291, 100787, 101267, 101719, + 102191, 102667, 103171, 103687, 104207, 104707, 105227, 105751, 106279, 106787, + 107323, 107827, 108343, 108883, 109423, 109943, 110479, 111031, 111539, 112067, + 112603, 113159, 113719, 114259, 114799, 115363, 115931, 116491, 117071, 117659, + 118247, 118831, 119419, 119963, 120539, 121123, 121687, 122263, 122867, 123479, + 124067, 124643, 125243, 125863, 126443, 127031, 127607, 128239, 128879, 129499, + 130147, 130783, 131363, 131543, 132199, 132859, 133519, 134171, 134807, 135463, + 136139, 136811, 137491, 138179, 138863, 139511, 140191, 140891, 141587, 142271, + 142979, 143687, 144379, 145091, 145799, 146519, 147211, 147919, 148627, 149371, + 150107, 150847, 151603, 152363, 153107, 153871, 154619, 155371, 156119, 156887, + 157667, 158443, 159223, 160019, 160807, 161611, 162419, 163211, 164023, 164839, + 165667, 166487, 167311, 168151, 168991, 169823, 170647, 171491, 172331, 173183, + 174047, 174907, 175783, 176651, 177511, 178403, 179287, 180179, 181003, 181871, + 182779, 183691, 184607, 185519, 186451, 187367, 188291, 189199, 190147, 191047, + 192007, 192971, 193939, 194911, 195887, 196871, 197831, 198811, 199783, 200771, + 201743, 202751, 203767, 204751, 205759, 206779, 207799, 208843, 209887, 210907, + 211927, 212987, 214003, 215051, 216119, 217199, 218279, 219371, 220447, 221539, + 222587, 223667, 224683, 225751, 226819, 227947, 228983, 230123, 231271, 232391, + 233551, 234659, 235783, 236947, 238099, 239287, 240479, 241603, 242807, 244003, + 245171, 246371, 247607, 248851, 250091, 251323, 252559, 253787, 255043, 256307, + 257591, 258871, 260171, 261427, 262723, 263951, 265271, 266587, 267887, 269219, + 270563, 271919, 273271, 274579, 275911, 277223, 278591, 279967, 281363, 282767, + 284159, 285559, 286987, 288403, 289843, 291299, 292759, 294223, 295699, 297151, + 298631, 300119, 301579, 303091, 304559, 306083, 307583, 309091, 310643, 312199, + 313679, 315247, 316819, 318403, 319967, 321547, 323123, 324743, 326351, 327967, + 329587, 331231, 332887, 334547, 336199, 337859, 339467, 341171, 342871, 344587, + 346303, 348011, 349759, 351503, 353263, 355027, 356803, 358591, 360391, 362143, + 363959, 365779, 367603, 369407, 371227, 373091, 374939, 376787, 378667, 380563, + 382463, 384359, 386279, 388211, 390151, 392099, 394063, 396031, 398011, 399979, + 401939, 403951, 405947, 407923, 409967, 412019, 414083, 416147, 418199, 420263, + 422311, 424423, 426527, 428639, 430783, 432931, 435103, 437263, 439459, 441667, + 443867, 446087, 448303, 450479, 452731, 454991, 457267, 459523, 461803, 464119, + 466423, 468739, 471091, 473443, 475807, 478171, 480563, 482947, 485347, 487783, + 490207, 492647, 495119, 497587, 500083, 502543, 505067, 507599, 510127, 512663, + 515191, 517739, 520339, 522947, 525571, 528163, 530807, 533447, 536111, 538799, + 541483, 544199, 546919, 549623, 552379, 555143, 557927, 560719, 563503, 566311, + 569083, 571939, 574799, 577627, 580471, 583367, 586291, 589187, 592139, 595087, + 598051, 601031, 604031, 607043, 610063, 613099, 616171, 619247, 622331, 625451, + 628583, 631711, 634859, 638023, 641227, 644431, 647659, 650911, 654163, 657431, + 660727, 664043, 667363, 670711, 674059, 677387, 680783, 684191, 687623, 691051, + 694511, 697979, 701479, 704999, 708527, 712067, 715639, 719179, 722783, 726367, + 729991, 733651, 737327, 741007, 744727, 748463, 752183, 755959, 759719, 763523, + 767323, 771143, 775007, 778871, 782783, 786659, 790567, 794531, 798487, 802471, + 806503, 810539, 814579, 818659, 822763, 826879, 831023, 835123, 839303, 843503, + 847727, 851971, 856187, 860479, 864803, 869119, 873463, 877843, 882239, 886651, + 891103, 895571, 900019, 904531, 909071, 913639, 918199, 922807, 927403, 931999, + 936679, 941383, 946091, 950839, 955607, 960383, 965179, 970027, 974891, 979787, + 984703, 989623, 994559, 999491, 1004483, 1009483, 1014547, 1019639, 1024703, 1029823, + 1034983, 1040167, 1045391, 1050631, 1054171, 1059439, 1064743, 1070087, 1075463, 1080847, + 1086259, 1091711, 1097179, 1102691, 1108223, 1113787, 1119359, 1124983, 1130627, 1136299, + 1142003, 1147739, 1153487, 1159283, 1165103, 1170947, 1176827, 1182739, 1188667, 1194631, + 1200607, 1206619, 1212671, 1218727, 1224823, 1230967, 1237139, 1243343, 1249559, 1255811, + 1262119, 1268447, 1274803, 1281187, 1287623, 1294087, 1300571, 1307063, 1313623, 1320191, + 1326791, 1333411, 1340107, 1346827, 1353551, 1360327, 1367159, 1374007, 1380887, 1387783, + 1394747, 1401739, 1408763, 1415803, 1422899, 1430027, 1437199, 1444411, 1451603, 1458871, + 1466147, 1473503, 1480903, 1488343, 1495751, 1503247, 1510759, 1518343, 1525963, 1533583, + 1541251, 1548947, 1556719, 1564499, 1572359, 1580251, 1588159, 1596107, 1604123, 1612183, + 1620247, 1628383, 1636543, 1644691, 1652947, 1661243, 1669543, 1677899, 1686319, 1694767, + 1703267, 1711799, 1720399, 1729043, 1737691, 1746419, 1755179, 1763959, 1772819, 1781699, + 1790599, 1799591, 1808627, 1817663, 1826771, 1835923, 1845119, 1854379, 1863671, 1873019, + 1882403, 1891859, 1901359, 1910891, 1920487, 1930099, 1939787, 1949527, 1959283, 1969111, + 1978927, 1988839, 1998827, 2008807, 2018899, 2029003, 2039179, 2049419, 2059711, 2069959, + 2080339, 2090771, 2101259, 2106551, 2117119, 2127739, 2138387, 2149127, 2159923, 2170771, + 2181671, 2192623, 2203631, 2214691, 2225819, 2236987, 2248223, 2259503, 2270803, 2282207, + 2293567, 2305091, 2316667, 2328307, 2340007, 2351731, 2363507, 2375327, 2387243, 2399207, + 2411243, 2423359, 2435519, 2447743, 2460043, 2472403, 2484803, 2497259, 2509807, 2522407, + 2535059, 2547791, 2560583, 2573423, 2586343, 2599327, 2612383, 2625487, 2638651, 2651899, + 2665199, 2678551, 2692003, 2705519, 2719111, 2732759, 2746423, 2760223, 2774071, 2788007, + 2802011, 2816059, 2830151, 2844367, 2858623, 2872967, 2887363, 2901839, 2916383, 2930999, + 2945707, 2960467, 2975339, 2990279, 3005267, 3020351, 3035507, 3050759, 3066067, 3081443, + 3096911, 3112391, 3127979, 3143671, 3159439, 3175259, 3191099, 3207119, 3223223, 3239419, + 3255683, 3272039, 3288479, 3304991, 3321583, 3338263, 3355031, 3371867, 3388799, 3405791, + 3422807, 3439987, 3457271, 3474599, 3492043, 3509587, 3527219, 3544907, 3562711, 3580579, + 3598519, 3616583, 3634727, 3652991, 3671347, 3689771, 3708283, 3726911, 3745631, 3764443, + 3783343, 3802283, 3821327, 3840479, 3859759, 3879023, 3898483, 3918067, 3937751, 3957479, + 3977339, 3997307, 4017359, 4037531, 4057799, 4078187, 4098659, 4119239, 4139923, 4160711, + 4181579, 4202567, 4210807, 4231943, 4253203, 4274551, 4295999, 4317571, 4339207, 4361003, + 4382879, 4404899, 4426999, 4449227, 4471559, 4494019, 4516571, 4539247, 4562039, 4584959, + 4607987, 4631131, 4654399, 4677779, 4701239, 4724831, 4748563, 4772399, 4796371, 4820443, + 4844659, 4868999, 4893419, 4918007, 4942687, 4967491, 4992419, 5017447, 5042647, 5067967, + 5093423, 5119007, 5144707, 5170519, 5196467, 5222579, 5248787, 5275159, 5301623, 5328251, + 5355019, 5381927, 5408947, 5436127, 5463391, 5490787, 5518351, 5546071, 5573927, 5601907, + 5630039, 5658307, 5686739, 5715299, 5743987, 5772847, 5801843, 5830963, 5860243, 5889683, + 5919271, 5948939, 5978831, 6008867, 6038999, 6069311, 6099767, 6130391, 6161063, 6192023, + 6223099, 6254359, 6285787, 6317327, 6349043, 6380939, 6412999, 6445223, 6477599, 6510107, + 6542803, 6575671, 6608639, 6641839, 6675211, 6708739, 6742363, 6776207, 6810247, 6844447, + 6878803, 6913351, 6948079, 6982907, 7017979, 7053223, 7088611, 7124231, 7159987, 7195963, + 7232111, 7268423, 7304939, 7341647, 7378531, 7415599, 7452859, 7490303, 7527911, 7565627, + 7603627, 7641791, 7680191, 7718771, 7757543, 7796491, 7835647, 7874983, 7914551, 7954319, + 7994279, 8034451, 8074811, 8115383, 8156147, 8197099, 8238247, 8279627, 8321227, 8363023, + 8405003, 8419511, 8461787, 8504291, 8546999, 8589923, 8633063, 8676431, 8719987, 8763803, + 8807803, 8852059, 8896483, 8941171, 8986091, 9031207, 9076579, 9122143, 9167923, 9213979, + 9260263, 9306779, 9353483, 9400463, 9447667, 9495139, 9542843, 9590699, 9638891, 9687323, + 9735991, 9784903, 9834047, 9883463, 9933059, 9982939, 10033063, 10083443, 10134107, 10185011, + 10236179, 10287587, 10339267, 10391219, 10443431, 10495907, 10548623, 10601627, 10654871, 10708403, + 10762211, 10816271, 10870619, 10925227, 10980059, 11035223, 11090627, 11146279, 11202251, 11258483, + 11314987, 11371807, 11428931, 11486347, 11544047, 11602043, 11660339, 11718923, 11777791, 11836963, + 11896427, 11956199, 12016187, 12076567, 12137183, 12198139, 12259399, 12320983, 12382823, 12445039, + 12507559, 12570403, 12633559, 12697039, 12760843, 12824899, 12889339, 12954079, 13019143, 13084531, + 13150279, 13216331, 13282723, 13349411, 13416463, 13483751, 13551467, 13619563, 13687987, 13756739, + 13825831, 13895291, 13965103, 14035279, 14105759, 14176619, 14247847, 14319419, 14391359, 14463667, + 14536307, 14609351, 14682719, 14756491, 14830603, 14905123, 14980019, 15055259, 15130903, 15206899, + 15283291, 15360071, 15437239, 15514783, 15592739, 15671087, 15749819, 15828947, 15908423, 15988363, + 16068691, 16149431, 16230491, 16312039, 16394003, 16476371, 16559159, 16642343, 16725971, 16810007, + 16836587, 16921183, 17006167, 17091623, 17177507, 17263783, 17350519, 17437691, 17525243, 17613307, + 17701807, 17790739, 17880067, 17969911, 18060187, 18150911, 18242083, 18333703, 18425819, 18518363, + 18611419, 18704927, 18798907, 18893351, 18988267, 19083679, 19179551, 19275847, 19372699, 19470019, + 19567811, 19666123, 19764947, 19864267, 19964059, 20064371, 20165143, 20266391, 20368211, 20470547, + 20573411, 20676791, 20780659, 20885071, 20989967, 21095423, 21201347, 21307859, 21414923, 21522511, + 21630659, 21739351, 21848579, 21958367, 22068647, 22179511, 22290943, 22402951, 22515511, 22628651, + 22742303, 22856527, 22971259, 23086667, 23202643, 23319227, 23436407, 23554099, 23672459, 23791399, + 23910947, 24031087, 24151807, 24273163, 24395023, 24517607, 24640799, 24764611, 24889043, 25014071, + 25139767, 25266071, 25393031, 25520623, 25648867, 25777639, 25907143, 26037299, 26168099, 26299571, + 26431723, 26564507, 26697991, 26832139, 26966963, 27102419, 27238559, 27375419, 27512951, 27651191, + 27790127, 27929723, 28070071, 28211123, 28352887, 28495351, 28638539, 28782419, 28927039, 29072399, + 29218403, 29365207, 29512739, 29661043, 29810023, 29959819, 30110347, 30261643, 30413707, 30566519, + 30720119, 30874483, 31029587, 31185443, 31342139, 31499599, 31657783, 31816847, 31976723, 32137403, + 32298863, 32461159, 32624239, 32788099, 32952839, 33118391, 33284803, 33452047, 33619979, 33670103, + 33839243, 34009279, 34180163, 34351879, 34524491, 34697951, 34872283, 35047483, 35223599, 35400583, + 35578471, 35757247, 35936903, 36117467, 36298943, 36481343, 36664651, 36848891, 37033987, 37220047, + 37407059, 37595027, 37783927, 37973783, 38164571, 38356327, 38548999, 38742707, 38937319, 39132979, + 39329627, 39527123, 39725723, 39925339, 40125947, 40327571, 40530199, 40733867, 40938523, 41144203, + 41350943, 41558687, 41767483, 41977367, 42188287, 42400243, 42613303, 42827431, 43042631, 43258907, + 43476287, 43694747, 43914307, 44134931, 44356639, 44579503, 44803511, 45028639, 45254899, 45482291, + 45710831, 45940523, 46171351, 46403347, 46636519, 46870867, 47106379, 47343083, 47580983, 47820079, + 48060359, 48301867, 48544583, 48788503, 49033651, 49280003, 49527619, 49776479, 50026607, 50277979, + 50530619, 50784523, 51039683, 51296159, 51553903, 51812927, 52073279, 52334951, 52597891, 52862143, + 53127779, 53394727, 53663039, 53932651, 54203659, 54476027, 54749771, 55024859, 55301359, 55579243, + 55858459, 56139079, 56421151, 56704667, 56989571, 57275927, 57563699, 57852943, 58143583, 58435703, + 58729331, 59024443, 59321039, 59619127, 59918687, 60219779, 60522379, 60826511, 61132163, 61439239, + 61747963, 62058247, 62370079, 62683463, 62998451, 63314959, 63633079, 63952799, 64274159, 64597111, + 64921699, 65247907, 65575747, 65905267, 66236431, 66569267, 66903779, 67239967, 67338643, 67677007, + 68017067, 68358739, 68702143, 69047299, 69394219, 69742919, 70093327, 70445519, 70799507, 71155267, + 71512787, 71872127, 72233279, 72596243, 72961039, 73327651, 73696111, 74066411, 74438591, 74812651, + 75188591, 75566347, 75946067, 76327703, 76711231, 77096707, 77484083, 77873431, 78264727, 78657983, + 79053187, 79450363, 79849543, 80250763, 80654027, 81059287, 81466579, 81875951, 82287379, 82700791, + 83116367, 83534023, 83953763, 84375623, 84799619, 85225739, 85653947, 86084287, 86516863, 86951603, + 87388531, 87827647, 88268987, 88712527, 89158283, 89606287, 90056467, 90508987, 90963799, 91420867, + 91880263, 92341967, 92805983, 93272327, 93741019, 94212031, 94685419, 95161219, 95639387, 96119927, + 96602903, 97088339, 97576163, 98066491, 98559259, 99054523, 99552227, 100052467, 100555243, 101060539, + 101568287, 102078679, 102591631, 103107119, 103625239, 104145887, 104669179, 105195127, 105723743, 106254899, + 106788827, 107325451, 107864747, 108406763, 108951503, 109498943, 110049059, 110602031, 111157807, 111716383, + 112277699, 112841863, 113408767, 113978507, 114551263, 115126883, 115705351, 116286743, 116871091, 117458347, + 118048547, 118641739, 119237927, 119837059, 120439243, 121044431, 121652599, 122263903, 122878211, 123495683, + 124116191, 124739887, 125366567, 125996539, 126629663, 127265951, 127905443, 128548139, 129194083, 129843299, + 130495763, 131151491, 131810491, 132472831, 133138519, 133807547, 134479879, 134673607, 135350351, 136030471, + 136714027, 137400979, 138091427, 138785203, 139482599, 140183503, 140887919, 141595859, 142307287, 143022359, + 143741047, 144463339, 145189259, 145918711, 146651903, 147388823, 148129447, 148873787, 149621891, 150373759, + 151129399, 151888843, 152652103, 153419159, 154190087, 154964867, 155743583, 156526207, 157312763, 158103259, + 158897743, 159696211, 160498699, 161305211, 162115787, 162930419, 163749119, 164571971, 165398927, 166230007, + 167065303, 167904791, 168748499, 169596463, 170448683, 171305207, 172165991, 173031143, 173900563, 174774427, + 175652671, 176535311, 177422411, 178313951, 179209991, 180110471, 181015519, 181925111, 182839303, 183758039, + 184681411, 185609447, 186542099, 187479491, 188421539, 189368371, 190319959, 191276291, 192237431, 193203431, + 194174191, 195149939, 196130579, 197116159, 198106663, 199102151, 200102579, 201108043, 202118563, 203134123, + 204154859, 205180751, 206211799, 207248011, 208289351, 209336027, 210387907, 211445131, 212507651, 213575503, + 214648699, 215727247, 216811267, 217900763, 218995739, 220096183, 221202119, 222313643, 223430791, 224553523, + 225681923, 226815983, 227955727, 229101203, 230252411, 231409439, 232572299, 233740999, 234915539, 236095939, + 237282343, 238474711, 239672963, 240877339, 242087771, 243304219, 244526851, 245755619, 246990559, 248231707, + 249479099, 250732739, 251992667, 253258879, 254531507, 255810559, 257096039, 258387967, 259686391, 260991287, + 262302791, 263620879, 264945587, 266276947, 267614983, 268959767, 269344759, 270698227, 272058491, 273425591, + 274799579, 276180431, 277568219, 278963011, 280364803, 281773571, 283189499, 284612527, 286042723, 287480071, + 288924599, 290376451, 291835627, 293302123, 294775991, 296257271, 297745967, 299242171, 300745843, 302257051, + 303775919, 305302427, 306836599, 308378407, 309928027, 311485423, 313050587, 314623703, 316204703, 317793559, + 319390507, 320995471, 322608491, 324229639, 325858867, 327496339, 329142019, 330795991, 332458267, 334128887, + 335807831, 337495303, 339191227, 340895683, 342608719, 344330351, 346060571, 347799511, 349547071, 351303583, + 353068907, 354843119, 356626211, 358418243, 360219283, 362029403, 363848627, 365676923, 367514491, 369361231, + 371217299, 373082707, 374957483, 376841587, 378735251, 380638387, 382551083, 384473399, 386405387, 388347103, + 390298547, 392259767, 394230899, 396211903, 398202899, 400203871, 402214927, 404236087, 406267391, 408308899, + 410360539, 412422631, 414495091, 416577947, 418671283, 420775151, 422889583, 425014571, 427150247, 429296719, + 431453983, 433622011, 435800971, 437990923, 440191879, 442403887, 444627019, 446861267, 449106787, 451363571, + 453631727, 455911259, 458202211, 460504699, 462818767, 465144487, 467481851, 469831003, 472191851, 474564667, + 476949379, 479346103, 481754807, 484175663, 486608687, 489053951, 491511491, 493981363, 496463519, 498958307, + 501465563, 503985479, 506518063, 509063299, 511621387, 514192271, 516776131, 519372859, 521982751, 524605747, + 527241899, 529891199, 532553939, 535230083, 537919639, 538685971, 541392743, 544113239, 546847447, 549595367, + 552357139, 555132803, 557922367, 560725951, 563543663, 566375527, 569221603, 572081959, 574956703, 577845787, + 580749511, 583667831, 586600783, 589548499, 592511039, 595488451, 598480807, 601488211, 604510703, 607548371, + 610601371, 613669687, 616753427, 619852679, 622967503, 626097991, 629244167, 632406163, 635584031, 638777903, + 641987839, 645213847, 648456091, 651714607, 654989519, 658280863, 661588783, 664913323, 668254571, 671612587, + 674987507, 678379379, 681788203, 685214251, 688657483, 692117983, 695595931, 699091331, 702604327, 706134991, + 709683371, 713249591, 716833727, 720435851, 724056107, 727694531, 731351279, 735026371, 738719939, 742432063, + 746162863, 749912399, 753680731, 757468067, 761274403, 765099883, 768944587, 772808551, 776691959, 780594923, + 784517507, 788459759, 792421843, 796403831, 800405831, 804427927, 808470259, 812532911, 816615971, 820719539, + 824843651, 828988331, 833154031, 837340703, 841548427, 845777279, 850027351, 854298799, 858591751, 862906279, + 867242491, 871600487, 875980379, 880382287, 884806283, 889252471, 893721071, 898212083, 902725711, 907261963, + 911821051, 916403011, 921007907, 925636079, 930287503, 934962299, 939660587, 944382499, 949128119, 953897599, + 958691051, 963508519, 968350231, 973216267, 978106799, 983021807, 987961591, 992926211, 997915771, 1002930347, + 1007970143, 1013035271, 1018125743, 1023241907, 1028383823, 1033551523, 1038745151, 1043964947, 1049210831, 1054483151, + 1059782051, 1065107587, 1070459851, 1075839019, 1077368339, 1082782187, 1088223299, 1093691743, 1099187591, 1104711019, + 1110262327, 1115841499, 1121448739, 1127084059, 1132747771, 1138439959, 1144160711, 1149910183, 1155688603, 1161496079, + 1167332711, 1173198647, 1179094079, 1185019067, 1190973899, 1196958667, 1202973511, 1209018599, 1215094019, 1221199951, + 1227336631, 1233504079, 1239702463, 1245932059, 1252193003, 1258485419, 1264809463, 1271165167, 1277552923, 1283972759, + 1290424799, 1296909343, 1303426459, 1309976287, 1316559071, 1323174883, 1329823987, 1336506463, 1343222567, 1349972251, + 1356756031, 1363573879, 1370425967, 1377312463, 1384233491, 1391189419, 1398180307, 1405206307, 1412267611, 1419364259, + 1426496711, 1433664959, 1440869279, 1448109779, 1455386671, 1462700131, 1470050363, 1477437523, 1484861771, 1492323307, + 1499822383, 1507359151, 1514933747, 1522546447, 1530197423, 1537886851, 1545614899, 1553381771, 1561187699, 1569032827, + 1576917379, 1584841567, 1592805583, 1600809611, 1608853859, 1616938507, 1625063819, 1633229951, 1641437099, 1649685467, + 1657975307, 1666306819, 1674680207, 1683095671, 1691553427, 1700053627, 1708596587, 1717182347, 1725811267, 1734483643, + 1743199571, 1751959367, 1760763107, 1769611087, 1778503583, 1787440747, 1796422847, 1805449999, 1814522603, 1823640799, + 1832804767, 1842014791, 1851271043, 1860573907, 1869923411, 1879319999, 1888763743, 1898254999, 1907793931, 1917380807, + 1927015879, 1936699351, 1946431363, 1956212243, 1966042451, 1975922059, 1985851247, 1995830323, 2005859543, 2015939239, + 2026069559, 2036250751, 2046483151, 2056766983, 2067102431, 2077489807, 2087929451, 2098421519, 2108966287, 2119564099, + 2130215159, 2140919723, + }; + + + // Compile-time constant expressions + private static final int MAX_REGULAR_CAPACITY_FOR_DOUBLED_ARRAY = 107325451; + private static final int MAX_REGULAR_INT_CAPACITY = 2140919723; + static { + if (MAX_REGULAR_INT_CAPACITY != REGULAR_INT_CAPACITIES[REGULAR_INT_CAPACITIES.length - 1] || + binarySearch(REGULAR_INT_CAPACITIES, MAX_REGULAR_CAPACITY_FOR_DOUBLED_ARRAY) < 0) + throw new AssertionError(); + } + + /** + * Class for precise and fast scaling non-negative integers by positive doubles. + * + *
Used in {@link com.koloboke.collect.impl.hash.HashConfigWrapper}. + * + *
Latencies of operations on floating stack, required for simple approach scaling + *
+ * Haswell Steamroller + * FILD (long -> double) 6 11 + * FMUL 5 5 + * FDIV 10-24 9-37 + * FIST (double -> long) 7 7 + *
+ * + *
In major cases {@code Scaler} allows to replace this + * with megamorphic call cost + a few clock cycles. + */ + private static class Scaler { + + public static Scaler by(double scale) { + if (Double.isNaN(scale) || scale <= 0.0 || Double.isInfinite(scale)) + throw new IllegalArgumentException( + "Scale should be a finite positive number, " + scale + " is given"); + if (scale == 0.25) return BY_0_25; + // Special "precise" BigDecimal forms for scales which are inversions of custom + // scales are needed to preserve inversion consistency + if (scale == 1.0 / 3.0) return BY_3_0_INVERSE; + if (scale == 0.5) return BY_0_5; + if (scale == 1 / 1.5) return BY_1_5_INVERSE; + if (scale == 0.75) return BY_0_75; + if (scale == 1.0) return BY_1_0; + if (scale == 1.0 / 0.75) return BY_0_75_INVERSE; + if (scale == 1.5) return BY_1_5; + if (scale == 2.0) return BY_2_0; + if (scale == 3.0) return BY_3_0; + if (scale == 4.0) return BY_4_0; + return new Scaler(scale); + } + + static final Scaler BY_0_25 = new Scaler(0.25) { + @Override public int scaleUpper(int n) { check(n); return (n >> 2) + 1 ; } + @Override public int scaleLower(int n) { check(n); return n >> 2 ; } + }; + + static final Scaler BY_3_0_INVERSE = new Scaler(1.0 / 3.0); + + static final Scaler BY_0_5 = new Scaler(0.5) { + @Override public int scaleUpper(int n) { check(n); return (n >> 1) + 1 ; } + @Override public int scaleLower(int n) { check(n); return n >> 1 ; } + }; + + static final Scaler BY_1_5_INVERSE = new Scaler(1.0 / 1.5); + + static final Scaler BY_0_75 = new Scaler(0.75) { + @Override public int scaleUpper(int n) { check(n); int r = n - (n >> 2); return (n & 3 ) != 0 ? r : r + 1 ; } + @Override public int scaleLower(int n) { check(n); int r = n - (n >> 2); return (n & 3 ) != 0 ? r - 1 : r ; } + }; + + static final Scaler BY_1_0 = new Scaler(1.0) { + @Override public int scaleUpper(int n) { check(n); return n < Integer.MAX_VALUE ? n + 1 : Integer.MAX_VALUE; } + @Override public int scaleLower(int n) { check(n); return n ; } + }; + + static final Scaler BY_0_75_INVERSE = new Scaler(1.0 / 0.75); + + static final Scaler BY_1_5 = new Scaler(1.5) { + @Override public int scaleUpper(int n) { check(n); return n <= 1431655764 ? n + (n >> 1) + 1 : Integer.MAX_VALUE; } + @Override public int scaleLower(int n) { check(n); return n <= 1431655764 ? n + (n >> 1) : Integer.MAX_VALUE; } + }; + + static final Scaler BY_2_0 = new Scaler(2.0) { + @Override public int scaleUpper(int n) { check(n); return n < (1 << 30) ? (n << 1) + 1 : Integer.MAX_VALUE; } + @Override public int scaleLower(int n) { check(n); return n < (1 << 30) ? (n << 1) : Integer.MAX_VALUE; } + }; + + static final Scaler BY_3_0 = new Scaler(3.0) { + @Override public int scaleUpper(int n) { check(n); return n <= 715827882 ? n + (n << 1) + 1 : Integer.MAX_VALUE; } + @Override public int scaleLower(int n) { check(n); return n <= 715827882 ? n + (n << 1) : Integer.MAX_VALUE; } + }; + + static final Scaler BY_4_0 = new Scaler(4.0) { + @Override public int scaleUpper(int n) { check(n); return n < (1 << 29) ? (n << 2) + 1 : Integer.MAX_VALUE; } + @Override public int scaleLower(int n) { check(n); return n < (1 << 29) ? (n << 2) : Integer.MAX_VALUE; } + }; + + private static void check(int n) { + assert n >= 0 : "n should be non-negative, otherwise result is undefined"; + } + + final double scale; + + private Scaler(double scale) { + this.scale = scale; + } + + public int scaleUpper(int n) { + check(n); + int lower = (int) ((double) n * scale); + return lower < Integer.MAX_VALUE ? lower + 1 : Integer.MAX_VALUE; + } + + public int scaleLower(int n) { + check(n); + return (int) ((double) n * scale); + } + } +} diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/CHRHashOverflowException.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/CHRHashOverflowException.java new file mode 100644 index 000000000..3975d28d4 --- /dev/null +++ b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/CHRHashOverflowException.java @@ -0,0 +1,28 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.simantics.scl.runtime.chr; + +/** + * An exception thrown when element or entry couldn't be inserted into the hash container + * due to implementation limitations. + */ +public class CHRHashOverflowException extends IllegalStateException { + private static final long serialVersionUID = 0L; + public CHRHashOverflowException() { + } +} \ No newline at end of file diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/Fact.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/Fact.java new file mode 100644 index 000000000..f61d3079d --- /dev/null +++ b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/Fact.java @@ -0,0 +1,11 @@ +package org.simantics.scl.runtime.chr; + +public interface Fact { + /** + * Activates the fact with the given priority. The method returns + * the new priority of the fact or a negative number if the fact + * is deactivated. + */ + int activate(Object context, int priority); + boolean isAlive(); +} diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/FactActivationQueue.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/FactActivationQueue.java new file mode 100644 index 000000000..05b410de4 --- /dev/null +++ b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/FactActivationQueue.java @@ -0,0 +1,120 @@ +package org.simantics.scl.runtime.chr; + +import java.util.Arrays; + +public class FactActivationQueue { + public static final boolean TRACE = false; + + private final PriorityContainer[] containers; + private PriorityContainer[] activeContainers = new PriorityContainer[8]; + private int activeContainerCount; + + public FactActivationQueue(int priorityCount) { + if(TRACE) + System.out.println("priorityCount = " + priorityCount); + containers = new PriorityContainer[priorityCount]; + for(int i=0;i= activeContainerCount) { + if(npos >= activeContainerCount) + break; + PriorityContainer item1 = activeContainers[npos]; + if(priority > item1.priority) { + activeContainers[pos] = item1; + activeContainers[npos] = item; + return; + } + else + break; + } + PriorityContainer item1 = activeContainers[npos]; + PriorityContainer item2 = activeContainers[npos+1]; + if(priority < item1.priority) { + if(priority < item2.priority) + break; + } + else { + if(item1.priority < item2.priority) { + activeContainers[pos] = item1; + pos = npos; + continue; + } + } + activeContainers[pos] = item2; + pos = npos+1; + } + activeContainers[pos] = item; + } + + private void adjustUpwards(int pos, PriorityContainer item) { + int priority = item.priority; + while(pos > 0) { + int npos = (pos-1)/2; + PriorityContainer item1 = activeContainers[npos]; + if(item1.priority > priority) { + activeContainers[pos] = item1; + pos = npos; + } + else + break; + } + activeContainers[pos] = item; + } + + /** + * Activates all facts with priority less than the current priority + */ + public void activate(Object context, int currentPriority) { + if(TRACE) + System.out.println("FactActivationQueue.activate " + currentPriority); + while(activeContainerCount > 0) { + PriorityContainer topContainer = activeContainers[0]; + int priority = topContainer.priority; + if(priority >= currentPriority) + return; + + Fact fact = topContainer.pop(); + if(topContainer.size == 0) + deactivateContainer(); + + int newPriority = fact.activate(context, priority); + if(TRACE) + System.out.println(" [" + currentPriority + "] " + fact + " oldPriority=" + priority + ", newPriority=" + newPriority); + if(newPriority >= 0) + add(newPriority, fact); + } + } +} diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/PriorityContainer.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/PriorityContainer.java new file mode 100644 index 000000000..a19658e21 --- /dev/null +++ b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/chr/PriorityContainer.java @@ -0,0 +1,42 @@ +package org.simantics.scl.runtime.chr; + +import java.util.Arrays; + +class PriorityContainer { + private static final boolean CLEANUP_ENABLED = true; + + final int priority; + Fact[] facts = new Fact[4]; + int size; + + public PriorityContainer(int priority) { + this.priority = priority; + } + + public void push(Fact item) { + if(size == facts.length) + increaseCapacity(); + facts[size++] = item; + } + + private void increaseCapacity() { + if(CLEANUP_ENABLED) { + // Cleanup dead facts + int j=0; + for(int i=0;i= facts.length*3/4) + facts = Arrays.copyOf(facts, size*2); + } + + public Fact pop() { + return facts[--size]; + } +} diff --git a/bundles/org.simantics.scl.runtime/tests/org/simantics/scl/runtime/tests/TestCHRHashIndex.java b/bundles/org.simantics.scl.runtime/tests/org/simantics/scl/runtime/tests/TestCHRHashIndex.java new file mode 100644 index 000000000..87c71945c --- /dev/null +++ b/bundles/org.simantics.scl.runtime/tests/org/simantics/scl/runtime/tests/TestCHRHashIndex.java @@ -0,0 +1,163 @@ +package org.simantics.scl.runtime.tests; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Random; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.simantics.scl.runtime.chr.CHRHashIndex; + +import gnu.trove.map.hash.TIntObjectHashMap; +import gnu.trove.set.hash.THashSet; +import gnu.trove.set.hash.TIntHashSet; + +public class TestCHRHashIndex { + + Random random; + Store store; + Store2 store2; + THashSet aliveFacts = new THashSet(); + + public static class Store { + CHRHashIndex bfIndex = new CHRHashIndex() { + @Override + protected boolean keyEquals(Object a, Object b) { + return ((Fact)a).a == ((Fact)b).a; + } + @Override + protected int keyHashCode(Object key) { + return ((Fact)key).a; + } + }; + } + + public static class Store2 { + TIntObjectHashMap> bfIndex = new TIntObjectHashMap>(); + } + + public static class Fact { + public int a; // key + public int b; + public Fact bfPrev; + public Fact bfNext; + + public Fact(int a, int b) { + this.a = a; + this.b = b; + } + + public void add(Store store) { + bfNext = (Fact)store.bfIndex.addFreshAndReturnOld(this); + if(bfNext != null) + bfNext.bfPrev = this; + } + + public void remove(Store store) { + if(bfPrev == null) { + if(bfNext == null) + store.bfIndex.removeKnownToExistKey(this); + else { + bfNext.bfPrev = null; + store.bfIndex.replaceKnownToExistKey(this, bfNext); + } + } + else { + bfPrev.bfNext = bfNext; + if(bfNext != null) + bfNext.bfPrev = bfPrev; + } + } + + public List get(Store store) { + Object r = store.bfIndex.getEqual(this); + if(r == null) + return Collections.emptyList(); + else { + ArrayList result = new ArrayList(); + for(Fact cur=(Fact)r;cur!=null;cur=cur.bfNext) + result.add(cur); + Collections.reverse(result); + return result; + } + } + + public void add(Store2 store) { + LinkedHashSet set = store.bfIndex.get(a); + if(set == null) { + set = new LinkedHashSet<>(); + store.bfIndex.put(a, set); + } + set.add(this); + } + + public void remove(Store2 store) { + store.bfIndex.get(a).remove(this); + } + + public List get(Store2 store) { + LinkedHashSet set = store.bfIndex.get(a); + if(set == null) + return Collections.emptyList(); + else + return new ArrayList(set); + } + } + + @Before + public void init() { + random = new Random(123L); + store = new Store(); + store2 = new Store2(); + } + + public Fact createFact(int maxA, int maxB) { + return new Fact(random.nextInt(maxA), random.nextInt(maxB)); + } + + public void add(Fact fact) { + fact.add(store); + fact.add(store2); + aliveFacts.add(fact); + } + + public void remove(Fact fact) { + fact.remove(store); + fact.remove(store2); + aliveFacts.remove(fact); + } + + public void checkConsistency() { + TIntHashSet keys = new TIntHashSet(); + for(Fact fact : aliveFacts) + keys.add(fact.a); + Fact temp = new Fact(0, 0); + for(int a : keys.toArray()) { + temp.a = a; + Assert.assertEquals(temp.get(store2), temp.get(store)); + } + TIntHashSet keys2 = new TIntHashSet(); + for(Fact fact : store.bfIndex.toArray(new Fact[keys.size()])) + keys2.add(fact.a); + Assert.assertEquals(keys, keys2); + } + + @Test + public void testStore() { + for(int i=0;;++i) { + System.out.println("Run " + i); + for(int j=0;j<1000000;++j) + add(createFact(10000, 1000000)); + checkConsistency(); + ArrayList factArray = new ArrayList(aliveFacts); + Collections.shuffle(factArray, random); + for(Fact fact : factArray.subList(100000, factArray.size())) + remove(fact); + checkConsistency(); + } + } + +} diff --git a/bundles/org.simantics.scl.runtime/tests/org/simantics/scl/runtime/tests/TestFactActivationQueue.java b/bundles/org.simantics.scl.runtime/tests/org/simantics/scl/runtime/tests/TestFactActivationQueue.java new file mode 100644 index 000000000..aecd8de8c --- /dev/null +++ b/bundles/org.simantics.scl.runtime/tests/org/simantics/scl/runtime/tests/TestFactActivationQueue.java @@ -0,0 +1,58 @@ +package org.simantics.scl.runtime.tests; + +import java.util.Random; + +import org.junit.Assert; +import org.junit.Test; +import org.simantics.scl.runtime.chr.Fact; +import org.simantics.scl.runtime.chr.FactActivationQueue; + +import gnu.trove.list.array.TIntArrayList; + +public class TestFactActivationQueue { + public static Random RANDOM = new Random(); + + private static class MyFact implements Fact { + TIntArrayList list; + int priority; + + public MyFact(TIntArrayList list, int priority) { + this.list = list; + this.priority = priority; + } + + @Override + public int activate(Object context, int priority) { + Assert.assertEquals(this.priority, priority); + list.add(priority); + return -1; + } + + @Override + public boolean isAlive() { + return true; + } + } + + private void testRandomly(int priorities, int size) { + FactActivationQueue queue = new FactActivationQueue(priorities); + TIntArrayList list = new TIntArrayList(size); + for(int i=0;i imports = new ArrayList<>(); - imports.addAll(Arrays.asList(TextualModuleSource.DEFAULT_IMPORTS)); + imports.add(new ImportDeclaration("StandardLibrary", "")); for (String line : lines) { line = line.trim(); if (line.startsWith("import") || line.startsWith("include")) { diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/DebugPartionTokenScanner.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/DebugPartionTokenScanner.java new file mode 100644 index 000000000..2a69dc874 --- /dev/null +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/DebugPartionTokenScanner.java @@ -0,0 +1,48 @@ +package org.simantics.scl.ui.editor2; + +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.rules.IPartitionTokenScanner; +import org.eclipse.jface.text.rules.IToken; + +public class DebugPartionTokenScanner implements IPartitionTokenScanner { + IPartitionTokenScanner base; + + public DebugPartionTokenScanner(IPartitionTokenScanner base) { + this.base = base; + } + + @Override + public void setRange(IDocument document, int offset, int length) { + System.out.println(">>> setRange(" + offset + ", " + length + ")"); + base.setRange(document, offset, length); + } + + @Override + public IToken nextToken() { + IToken result = base.nextToken(); + System.out.println(">>> nextToken -> " + result + " " + result.getData()); + return result; + } + + @Override + public int getTokenOffset() { + int result = base.getTokenOffset(); + System.out.println(">>> getTokenOffset -> " + result); + return result; + } + + @Override + public int getTokenLength() { + int result = base.getTokenLength(); + System.out.println(">>> getTokenLength -> " + result); + return result; + } + + @Override + public void setPartialRange(IDocument document, int offset, int length, String contentType, int partitionOffset) { + System.out.println(">>> setPartialRange(" + offset + ", " + length + ", " + contentType + ", " + partitionOffset + ")"); + base.setPartialRange(document, offset, length, contentType, partitionOffset); + } + + +} diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2DocumentProvider.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2DocumentProvider.java index b92818aa5..f1bb9b54f 100644 --- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2DocumentProvider.java +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2DocumentProvider.java @@ -8,6 +8,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IDocumentPartitioner; +import org.eclipse.jface.text.rules.FastPartitioner; import org.eclipse.jface.text.source.AnnotationModel; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.ui.texteditor.AbstractDocumentProvider; @@ -52,6 +54,9 @@ public class SCLModuleEditor2DocumentProvider extends AbstractDocumentProvider { new Status(Status.ERROR, "org.simantics.scl.ui", "Reading SCL module failed.", e) ); } + IDocumentPartitioner partitioner = new FastPartitioner(new SCLPartitionScanner(), SCLPartitionScanner.PARTITION_TYPES); + partitioner.connect(document); + document.setDocumentPartitioner(partitioner); sourceViewer.updateCompletionAssistModuleName(source.getModuleName()); return document; } diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLPartitionScanner.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLPartitionScanner.java new file mode 100644 index 000000000..98e9a4665 --- /dev/null +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLPartitionScanner.java @@ -0,0 +1,33 @@ +package org.simantics.scl.ui.editor2; + +import org.eclipse.jface.text.rules.EndOfLineRule; +import org.eclipse.jface.text.rules.IPredicateRule; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.MultiLineRule; +import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; +import org.eclipse.jface.text.rules.SingleLineRule; +import org.eclipse.jface.text.rules.Token; + +public class SCLPartitionScanner extends RuleBasedPartitionScanner { + public static final String SCL_COMMENT = "COMMENT"; + public static final String SCL_STRING = "STRING"; + + public static final IToken COMMENT_TOKEN = new Token(SCL_COMMENT); + public static final IToken STRING_TOKEN = new Token(SCL_STRING); + + public static final String[] PARTITION_TYPES = new String[] { + SCL_COMMENT, + SCL_STRING + }; + + public SCLPartitionScanner() { + super(); + + setPredicateRules(new IPredicateRule[] { + new EndOfLineRule("//", COMMENT_TOKEN), + new MultiLineRule("\"\"\"", "\"\"\"", STRING_TOKEN, (char) 0, true), + new SingleLineRule("\"", "\"", STRING_TOKEN, '\\'), + new MultiLineRule("/*", "*/", COMMENT_TOKEN, (char) 0, true), + }); + } +} diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLPresentationReconciler.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLPresentationReconciler.java new file mode 100644 index 000000000..e45252e0d --- /dev/null +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLPresentationReconciler.java @@ -0,0 +1,106 @@ +package org.simantics.scl.ui.editor2; + +import org.eclipse.jface.resource.FontDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.TextAttribute; +import org.eclipse.jface.text.presentation.PresentationReconciler; +import org.eclipse.jface.text.rules.DefaultDamagerRepairer; +import org.eclipse.jface.text.rules.IRule; +import org.eclipse.jface.text.rules.ITokenScanner; +import org.eclipse.jface.text.rules.IWhitespaceDetector; +import org.eclipse.jface.text.rules.IWordDetector; +import org.eclipse.jface.text.rules.RuleBasedScanner; +import org.eclipse.jface.text.rules.Token; +import org.eclipse.jface.text.rules.WhitespaceRule; +import org.eclipse.jface.text.rules.WordRule; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.RGB; +import org.simantics.scl.ui.info.SCLInfo; + +public class SCLPresentationReconciler extends PresentationReconciler { + private static final FontDescriptor FONT_NORMAL = FontDescriptor.createFrom("Consolas", 10, SWT.NORMAL); + private static final FontDescriptor FONT_BOLD = FontDescriptor.createFrom("Consolas", 10, SWT.BOLD); + + public SCLPresentationReconciler(ResourceManager resourceManager) { + Font font = resourceManager.createFont(FONT_NORMAL); + { + DefaultDamagerRepairer dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute( + resourceManager.createColor(new RGB(63, 127, 95)), + null, + 0, + font + ))); + setDamager(dr, SCLPartitionScanner.SCL_COMMENT); + setRepairer(dr, SCLPartitionScanner.SCL_COMMENT); + } + { + DefaultDamagerRepairer dr = new DefaultDamagerRepairer(new StringTokenScanner(new TextAttribute( + resourceManager.createColor(new RGB(42, 0, 255)), + null, + 0, + font + ))); + setDamager(dr, SCLPartitionScanner.SCL_STRING); + setRepairer(dr, SCLPartitionScanner.SCL_STRING); + } + { + DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getSclTokenScanner(resourceManager)); + + setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); + setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); + } + } + + private static ITokenScanner getSclTokenScanner(ResourceManager resourceManager) { + RuleBasedScanner scanner = new RuleBasedScanner(); + + Token defaultToken = new Token( + new TextAttribute( + resourceManager.createColor(new RGB(0, 0, 0)), + null, + 0, + resourceManager.createFont(FONT_NORMAL) + )); + Token reserved = new Token( + new TextAttribute( + resourceManager.createColor(new RGB(127, 0, 85)), + null, + SWT.BOLD, + resourceManager.createFont(FONT_BOLD) + )); + + WordRule reservedWord = new WordRule(new IWordDetector() { + @Override + public boolean isWordStart(char c) { + return ('a' <= c && c <= 'z') + || ('A' <= c && c <= 'Z') + || c == '_' || c == '?'; + } + @Override + public boolean isWordPart(char c) { + return ('a' <= c && c <= 'z') + || ('A' <= c && c <= 'Z') + || ('0' <= c && c <= '9') + || c == '_' || c == '.' || c == '\''; + } + }, defaultToken); + + for(String word : SCLInfo.RESERVED_WORDS) + reservedWord.addWord(word, reserved); + + scanner.setRules(new IRule[] { + new WhitespaceRule(new IWhitespaceDetector() { + @Override + public boolean isWhitespace(char c) { + return c==' ' || c=='\t' || c=='\n' || c=='\r'; + } + }, defaultToken), + reservedWord + }); + scanner.setDefaultReturnToken(defaultToken); + + return scanner; + } +} diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SingleTokenScanner.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SingleTokenScanner.java new file mode 100644 index 000000000..4a7c3962e --- /dev/null +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SingleTokenScanner.java @@ -0,0 +1,22 @@ +package org.simantics.scl.ui.editor2; + +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.RuleBasedScanner; +import org.eclipse.jface.text.rules.Token; + +public class SingleTokenScanner extends RuleBasedScanner { + public SingleTokenScanner(Object attribute) { + setDefaultReturnToken(new Token(attribute)); + } + + @Override + public IToken nextToken() { + return super.nextToken(); + } + + @Override + public void setRange(IDocument document, int offset, int length) { + super.setRange(document, offset, length); + } +} \ No newline at end of file diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/StringTokenScanner.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/StringTokenScanner.java new file mode 100644 index 000000000..ec8237a47 --- /dev/null +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/StringTokenScanner.java @@ -0,0 +1,22 @@ +package org.simantics.scl.ui.editor2; + +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.RuleBasedScanner; +import org.eclipse.jface.text.rules.Token; + +public class StringTokenScanner extends RuleBasedScanner { + public StringTokenScanner(Object attribute) { + setDefaultReturnToken(new Token(attribute)); + } + + @Override + public IToken nextToken() { + return super.nextToken(); + } + + @Override + public void setRange(IDocument document, int offset, int length) { + super.setRange(document, offset, length); + } +} \ No newline at end of file diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/info/SCLInfo.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/info/SCLInfo.java index 8be82db9a..dba5c0cb7 100755 --- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/info/SCLInfo.java +++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/info/SCLInfo.java @@ -38,6 +38,7 @@ public class SCLInfo { "select", "enforce", "transformation", + "when" }; } diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/graph.tg b/bundles/org.simantics.tests.modelled.ui.ontology/graph.tg index 862131139..7935f8a67 100644 Binary files a/bundles/org.simantics.tests.modelled.ui.ontology/graph.tg and b/bundles/org.simantics.tests.modelled.ui.ontology/graph.tg differ diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/graph/TestsUI.pgraph b/bundles/org.simantics.tests.modelled.ui.ontology/graph/TestsUI.pgraph index b51213dc8..ecebcf8fa 100644 --- a/bundles/org.simantics.tests.modelled.ui.ontology/graph/TestsUI.pgraph +++ b/bundles/org.simantics.tests.modelled.ui.ontology/graph/TestsUI.pgraph @@ -33,6 +33,13 @@ MBC @VP.namedRelationChildRule TestsUI.Contributions.STSTests L0.Entity L0.ConsistsOf TESTS.STSTest @VP.namedConstantImageRule TestsUI.Contributions.TestImage TESTS.STSTest TestsUI.testImage +MBC + VP.BrowseContext.HasVisualsContribution _ : VP.VisualsContribution + VP.VisualsContribution.HasNodeType TESTS.STSSuite + VP.VisualsContribution.HasRule MBC.STSSuiteSorterRule + +MBC.STSSuiteSorterRule : VP.SorterRule + MAC = TestsUI.ModelingActionContext : VP.BrowseContext VP.BrowseContext.IsIncludedIn PROJECT.ProjectActionContext diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/src/org/simantics/tests/modelled/ui/ontology/TestsUIResource.java b/bundles/org.simantics.tests.modelled.ui.ontology/src/org/simantics/tests/modelled/ui/ontology/TestsUIResource.java index 897d42c9d..752d44620 100644 --- a/bundles/org.simantics.tests.modelled.ui.ontology/src/org/simantics/tests/modelled/ui/ontology/TestsUIResource.java +++ b/bundles/org.simantics.tests.modelled.ui.ontology/src/org/simantics/tests/modelled/ui/ontology/TestsUIResource.java @@ -11,6 +11,7 @@ import org.simantics.db.service.QueryControl; public class TestsUIResource { public final Resource BrowseContext; + public final Resource BrowseContext_STSSuiteSorterRule; public final Resource Contributions; public final Resource Contributions_NewSTSSuite; public final Resource Contributions_NewSTSTest; @@ -29,6 +30,7 @@ public class TestsUIResource { public static class URIs { public static final String BrowseContext = "http://www.simantics.org/TestsUI-1.0/BrowseContext"; + public static final String BrowseContext_STSSuiteSorterRule = "http://www.simantics.org/TestsUI-1.0/BrowseContext/STSSuiteSorterRule"; public static final String Contributions = "http://www.simantics.org/TestsUI-1.0/Contributions"; public static final String Contributions_NewSTSSuite = "http://www.simantics.org/TestsUI-1.0/Contributions/NewSTSSuite"; public static final String Contributions_NewSTSTest = "http://www.simantics.org/TestsUI-1.0/Contributions/NewSTSTest"; @@ -57,6 +59,7 @@ public class TestsUIResource { public TestsUIResource(ReadGraph graph) { BrowseContext = getResourceOrNull(graph, URIs.BrowseContext); + BrowseContext_STSSuiteSorterRule = getResourceOrNull(graph, URIs.BrowseContext_STSSuiteSorterRule); Contributions = getResourceOrNull(graph, URIs.Contributions); Contributions_NewSTSSuite = getResourceOrNull(graph, URIs.Contributions_NewSTSSuite); Contributions_NewSTSTest = getResourceOrNull(graph, URIs.Contributions_NewSTSTest); diff --git a/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF index 0e787d233..776eea39e 100644 --- a/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui, org.simantics.tests.modelled.ui.ontology;bundle-version="1.0.0", org.simantics.tests.modelled;bundle-version="1.0.0", org.eclipse.e4.ui.model.workbench, - org.simantics.scl.osgi + org.simantics.scl.osgi, + org.simantics.browsing.ui.model Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.tests.modelled.ui/adapters.xml b/bundles/org.simantics.tests.modelled.ui/adapters.xml new file mode 100644 index 000000000..d68f46686 --- /dev/null +++ b/bundles/org.simantics.tests.modelled.ui/adapters.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSSuiteSorterRule.java b/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSSuiteSorterRule.java new file mode 100644 index 000000000..bdb55b6a2 --- /dev/null +++ b/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSSuiteSorterRule.java @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright (c) 2007, 2011 Association for Decentralized Information Management in + * Industry THTH ry. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * VTT Technical Research Centre of Finland - initial API and implementation + *******************************************************************************/ +package org.simantics.tests.modelled.ui; + +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.simantics.browsing.ui.BuiltinKeys; +import org.simantics.browsing.ui.NodeContext; +import org.simantics.browsing.ui.model.browsecontexts.BrowseContext; +import org.simantics.browsing.ui.model.sorters.Sorter; +import org.simantics.browsing.ui.model.sorters.SorterRule; +import org.simantics.databoard.Bindings; +import org.simantics.db.ReadGraph; +import org.simantics.db.Resource; +import org.simantics.db.common.request.ResourceRead; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.exception.RuntimeDatabaseException; +import org.simantics.layer0.Layer0; +import org.simantics.tests.modelled.ontology.TestsResource; +import org.simantics.utils.datastructures.Pair; +import org.simantics.utils.strings.AlphanumComparator; + +public class STSSuiteSorterRule implements SorterRule, Sorter { + + @Override + public boolean isCompatible(Class contentType) { + return contentType.equals(Resource.class); + } + + @Override + public Sorter getSorter(ReadGraph graph, Object content) throws DatabaseException { + return this; + } + + @Override + public void sort(ReadGraph graph, BrowseContext context, List nodes) throws DatabaseException + { + try { + STSTestComparator stc = new STSTestComparator(); + stc.graph = graph; + Collections.sort(nodes, stc); + } catch (RuntimeDatabaseException e) { + if (e.getCause()!=null && e.getCause() instanceof DatabaseException) throw (DatabaseException) e.getCause(); + throw e; + } + } + + static class STSTestQuery extends ResourceRead> { + + public STSTestQuery(Resource resource) { + super(resource); + } + + @Override + public Pair perform(ReadGraph graph) throws DatabaseException { + Layer0 L0 = Layer0.getInstance(graph); + TestsResource TESTS = TestsResource.getInstance(graph); + + String name = graph.getRelatedValue2(resource, L0.HasName, Bindings.STRING); + Integer priority = graph.getRelatedValue2(resource, TESTS.STSTest_executionPriority, Bindings.INTEGER); + + return new Pair(priority, name); + } + + } + + static class STSTestComparator implements Comparator { + ReadGraph graph; + + @Override + public int compare(NodeContext nc1, NodeContext nc2) { + Resource r1 = (Resource) nc1.getConstant(BuiltinKeys.INPUT); + Resource r2 = (Resource) nc2.getConstant(BuiltinKeys.INPUT); + + try { + Pair test1 = graph.sync(new STSTestQuery(r1)); + Pair test2 = graph.sync(new STSTestQuery(r2)); + + if (test1.first < test2.first) + return -1; + else if (test1.first > test2.first) + return 1; + else return AlphanumComparator.COMPARATOR.compare(test1.second, test2.second); + + } catch (DatabaseException e) { + throw new RuntimeDatabaseException(e); + } + } + } +} diff --git a/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestSuiteModel.java b/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestSuiteModel.java index 188574e54..ad1e29531 100644 --- a/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestSuiteModel.java +++ b/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestSuiteModel.java @@ -30,6 +30,7 @@ import org.simantics.scl.compiler.runtime.RuntimeModule; import org.simantics.scl.osgi.SCLOsgi; import org.simantics.scl.runtime.reporting.AbstractSCLReportingHandler; import org.simantics.tests.modelled.ontology.TestsResource; +import org.simantics.utils.strings.AlphanumComparator; public class STSTestSuiteModel { @@ -435,9 +436,9 @@ public class STSTestSuiteModel { Collections.sort(tests, (o1, o2) -> { if (o1.priority < o2.priority) return -1; - if (o1.priority > o2.priority) + else if (o1.priority > o2.priority) return 1; - return 0; + else return AlphanumComparator.COMPARATOR.compare(o1.name, o2.name); }); suite.children(tests.toArray(new STSTest[tests.size()])); } else { diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java index 6f9bda06a..e85d2f7d7 100644 --- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java +++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java @@ -10,7 +10,7 @@ import org.junit.runner.notification.RunListener; import org.junit.runner.notification.RunNotifier; import org.junit.runners.ParentRunner; -public abstract class RuntimeSTSRunner extends ParentRunner { +public abstract class RuntimeSTSRunner extends ParentRunner { public RuntimeSTSRunner(Class testClass) throws Exception { super(testClass); @@ -20,12 +20,6 @@ public abstract class RuntimeSTSRunner extends ParentRunner { public abstract void deinitialize() throws Exception; - @Override - protected List getChildren() { - System.out.println("getting children"); - return RuntimeTestCollector.collectTests(); - } - @Override protected Description describeChild(Runner child) { return child.getDescription(); diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java index 70325319d..a02c69e85 100644 --- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java +++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java @@ -5,20 +5,19 @@ import java.util.Collection; import java.util.List; import org.junit.runner.Description; -import org.junit.runner.Runner; import org.simantics.scl.compiler.commands.CommandSession; import org.simantics.scl.osgi.SCLOsgi; -public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner { +public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner { private final List children = new ArrayList<>(); private final String suiteName; - RuntimeSTSSuiteRunner(String suiteName) throws Exception { - super(RuntimeSTSSuiteRunner.class); + protected RuntimeSTSSuiteRunner(Class clazz, String suiteName) throws Exception { + super(clazz); this.suiteName = suiteName; } - + @Override protected String getName() { return suiteName; @@ -36,19 +35,18 @@ public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner { testChildren.forEach(c -> c.setCommandSession(session)); children.addAll(testChildren); } - - @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override - protected List getChildren() { - return (List) children; + public List getChildren() { + return children; } @Override - public void initialize() { + public void initialize() throws Exception { } @Override - public void deinitialize() { + public void deinitialize() throws Exception { } } diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSTestRunner.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSTestRunner.java index a80b84e75..a86aa41d3 100644 --- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSTestRunner.java +++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSTestRunner.java @@ -63,7 +63,12 @@ public class RuntimeSTSTestRunner extends Runner { } } + public String getName() { + return name; + } + public Integer getPriority() { return priority; } -} + +} \ No newline at end of file diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java index 81d1ef7e7..0ab31b3f0 100644 --- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java +++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java @@ -7,7 +7,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.junit.runner.Runner; import org.simantics.Simantics; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; @@ -19,6 +18,7 @@ import org.simantics.layer0.Layer0; import org.simantics.modeling.ModelingUtils; import org.simantics.scl.runtime.tuple.Tuple0; import org.simantics.tests.modelled.ontology.TestsResource; +import org.simantics.utils.strings.AlphanumComparator; public class RuntimeTestCollector { @@ -50,7 +50,7 @@ public class RuntimeTestCollector { if (tests.isEmpty()) continue; - RuntimeSTSSuiteRunner suite = new RuntimeSTSSuiteRunner(suiteName); + RuntimeSTSSuiteRunner suite = new RuntimeSTSSuiteRunner(RuntimeSTSSuiteRunner.class, suiteName); List testRunners = new ArrayList<>(); for (Resource test : tests) { String testName = graph.getRelatedValue(test, L0.HasName, Bindings.STRING); @@ -61,10 +61,11 @@ public class RuntimeTestCollector { } testRunners.sort((test1, test2) -> { - if (test1.getPriority() <= test2.getPriority()) + if (test1.getPriority() < test2.getPriority()) return -1; - else + else if (test1.getPriority() > test2.getPriority()) return 1; + else return AlphanumComparator.COMPARATOR.compare(test1.getName(), test2.getName()); }); suite.addChildren(testRunners); suites.add(suite); @@ -83,7 +84,7 @@ public class RuntimeTestCollector { } } - public static List collectTests() { + public static List collectTests() { return new ArrayList<>(collectTestsFromGraph()); } } diff --git a/bundles/org.simantics/src/org/simantics/Simantics.java b/bundles/org.simantics/src/org/simantics/Simantics.java index daa9e7e10..5284c82a5 100644 --- a/bundles/org.simantics/src/org/simantics/Simantics.java +++ b/bundles/org.simantics/src/org/simantics/Simantics.java @@ -74,7 +74,7 @@ public class Simantics { /** * Default database driver ID */ - private static final String DEFAULT_DATABASE_DRIVER_ID = "procore"; + private static final String DEFAULT_DATABASE_DRIVER_ID = "acorn"; private static String defaultDatabaseDriverId = DEFAULT_DATABASE_DRIVER_ID; diff --git a/features/org.simantics.desktop.product.feature/feature.xml b/features/org.simantics.desktop.product.feature/feature.xml index a7292c7ba..f53593487 100644 --- a/features/org.simantics.desktop.product.feature/feature.xml +++ b/features/org.simantics.desktop.product.feature/feature.xml @@ -21,6 +21,10 @@ id="org.simantics.desktop" version="0.0.0"/> + + diff --git a/features/org.simantics.modeling.ui.workbench.feature/feature.xml b/features/org.simantics.modeling.ui.workbench.feature/feature.xml index 365429f26..e0a54c026 100644 --- a/features/org.simantics.modeling.ui.workbench.feature/feature.xml +++ b/features/org.simantics.modeling.ui.workbench.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.simantics.platform.feature/feature.xml b/features/org.simantics.platform.feature/feature.xml index 0ab47238e..cd044b436 100644 --- a/features/org.simantics.platform.feature/feature.xml +++ b/features/org.simantics.platform.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.simantics.platform.ui.feature/feature.xml b/features/org.simantics.platform.ui.feature/feature.xml index 000aad2c7..5d9020fc4 100644 --- a/features/org.simantics.platform.ui.feature/feature.xml +++ b/features/org.simantics.platform.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml index c1f5b0a46..d0b29dddc 100644 --- a/features/org.simantics.sdk.feature/feature.xml +++ b/features/org.simantics.sdk.feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml index 87b3ea7af..9ee0afe4e 100644 --- a/features/org.simantics.ui.workbench.feature/feature.xml +++ b/features/org.simantics.ui.workbench.feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml index b81e2e567..ec03fb6ce 100644 --- a/features/org.simantics.utils.feature/feature.xml +++ b/features/org.simantics.utils.feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/features/org.simantics.utils.ui.feature/feature.xml b/features/org.simantics.utils.ui.feature/feature.xml index 6924e60ac..0a2504e14 100644 --- a/features/org.simantics.utils.ui.feature/feature.xml +++ b/features/org.simantics.utils.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml index 5569344e7..7e1408ea5 100644 --- a/features/org.simantics.wiki.ui.feature/feature.xml +++ b/features/org.simantics.wiki.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.simantics.workbench.feature/feature.xml b/features/org.simantics.workbench.feature/feature.xml index 4cbd8dcef..7c84a304c 100644 --- a/features/org.simantics.workbench.feature/feature.xml +++ b/features/org.simantics.workbench.feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/releng/doc/dump-mysql-db.sh b/releng/doc/dump-mysql-db.sh new file mode 100755 index 000000000..271eb42c1 --- /dev/null +++ b/releng/doc/dump-mysql-db.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +major=$1 +minor=$2 +service=$3 +wikidb=$4 +wikidbusr=$5 + +srcdb=${wikidb} +srcdbusr=${wikidbusr} +tgtdb=${wikidb}_${major}_${minor}_${service} + +echo "Dumping database ${srcdb} to ${tgtdb} as user ${srcdbusr}" +echo "Press enter to continue or C-c to cancel" +read foo + +echo "Dumping $srcdb" +mysqldump -u ${srcdbusr} -p ${srcdb} > ${tgtdb}.dump diff --git a/releng/doc/dump-wikis.sh b/releng/doc/dump-wikis.sh new file mode 100755 index 000000000..ae2a64dc3 --- /dev/null +++ b/releng/doc/dump-wikis.sh @@ -0,0 +1,21 @@ +#!/bin/bash + + +major=1 +minor=25 +service=0 +ver=${major}.${minor}.${service} + +mkdir ${ver} +cd ${ver} +OLDIFS=$IFS +IFS=',' +for db in enduserwikidb,enduserwikiuser devwikidb,devwikiuser; do + set $db + sh ../dump-mysql-db.sh ${major} ${minor} ${service} ${1} ${2} +done +IFS=$OLDIFS + +cd .. +tar zcvf ${ver}.tar.gz ${ver} +rm -rf ${ver} diff --git a/releng/doc/release.html b/releng/doc/release.html new file mode 100644 index 000000000..1ede77087 --- /dev/null +++ b/releng/doc/release.html @@ -0,0 +1,564 @@ + + + +release + + + + +
Definition of Done for Simantics Platform Releases
+
+
The simantics/platform and simantics/third-party Git repositories have a branch release/x.y.z[.w] and tag x.y.z[.w].
+
A change log entry is compiled from the issues in this release and made available to the general public separately for the platform and for the open products included in the release train.
+
Roadmap is up-to-date.
+
Tutorials are up-to-date and coherent with the platform.
+
For all new major/minor releases, Wiki documentation is backed up (cloned).
+
+
+
Simantics Platform Release Process
+
+
Create release/x.y.z[.w] release stabilisation branch
+
Repeat until stable: +
+
Develop, test and document components and test products
+
+
+
Tag the release in repository
+
Backup documentation wiki databases
+
Build and publish SDK package with and without sources +
+
Does not really require any work
+
+
+
Build Simantics open source products and plug-in components which are a part of the release train
+
Update websites to reflect the new release
+
+
+
Released Plug-in Components and Products
+
There are both plug-in components and products that are part of the "Simantics release train" that shall be released simultaneously to a major or minor Simantics release.
+
Plug-in components are installable features that are deployed online as P2 repositories for general availability. Products are deployed as ZIP files and made available online in designated locations on simantics.org.
+
Products that are part of the release train:
+
+
Simantics Desktop
+
Simantics System Dynamics Tool - simantics/sysdyn.git
+
+
Plug-in components that are part of the release train:
+
+
Simantics R - simantics/r.git
+
FMIL - simantics/fmil.git
+
FMI Studio - members/fmi.git
+
Simupedia - Members SVN
+
+
For simplicity, each of these components are versioned accoring to platform versioning, i.e. for Platform SDK 1.26.0 there will be Simantics Desktop 1.26.0, Sysdyn 1.26.0, and so on.
+
+
Release Schedule
+
+
Releases are branched 4 weeks before the set release date.
+
During this time no more new features are allowed in the release branch and the existing work shall be stabilized. Work must be focused on bug fixes and documentation.
+
Source code changes to release branches are forbidden in the last 2 weeks. Documentation-only changes are still allowed. However, if critical show-stopper problems surface during that time, the changes must be done. After that the release engineering team must decide whether to stick to the original release schedule or whether to delay the release.
+
+
+
Simantics Platform Release - Step by Step
+
Create release branch from selected commit
+
When release stabilisation starts, branch simantics/platform and simantics/third-party repositories:
+
git clone ssh://<user>@www.simantics.org:29418/simantics/platform.git +cd platform +git branch release/x.y.z[.w] <commit> +git push origin release/x.y.z[.w] + +git clone ssh://<user>@www.simantics.org:29418/simantics/third-party.git +cd third-party +git branch release/x.y.z[.w] <commit> +git push origin release/x.y.z[.w] +
+
When creating major/minor releases <commit> is usually a commit in the master branch. +With service releases, branch from an existing release/* branch instead.
+
Prepare release branch for use
+
Prepare .target files
+
+
+
Retrieve release branch of the platform repository
+
git clone ssh://<user>@www.simantics.org:29418/simantics/platform.git +cd platform +git branch release/x.y.z[.w] remotes/origin/release/x.y.z[.w] +git checkout release/x.y.z[.w] +
+
+
+
Edit all target platform files in releng/org.simantics.sdk.build.targetdefinition/, i.e.
+
+
simantics.target
+
org.simantics.sdk.build.targetdefinition.target
+
+
At the beginning of simantics.target file, increment sequenceNumber by 1
+
<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?> +<target name="Simantics x.y.z[.w]" sequenceNumber="11"> +
+
Next, replace the following rows in both mentioned files:
+
<repository location="http://www.simantics.org/download/master/sdk"/> +<repository location="http://www.simantics.org/download/master/external-components/maven"/> +<repository location="http://www.simantics.org/download/master/external-components/manual"/> +
+
with
+
<repository location="http://www.simantics.org/download/release/x.y.z[.w]/sdk"/> +<repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/maven"/> +<repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/manual"/> +
+
+
+
Initialize release branch distribution web site
+
+
Run SDK/Deploy External Components to Web build with parameters: +
+
GERRIT_REFNAME: release/x.y.z[.w]
+
PUBLISH_ARTIFACTS: true
+
+
+
Run the SDK/Simantics SDK build with parameters: +
+
GERRIT_REFNAME: release/x.y.z[.w]
+
PUBLISH_ARTIFACTS: true
+
+
+
+
Running these two builds will ensure that both the external components required to build the SDK and the Simantics SDK for the new release branch are published online at http://www.simantics.org/download/release/x.y.z[.w]/.
+
After this, whenever changes are pushed/merged to release/x.y.z[.w] branch in Gerrit, new SDK/Simantics SDK builds are triggered automatically and they will publish the results at the same location online.
+
This means that one does not have to do any tricks after this to build and publish the SDK as a P2 repository online. It is an automated process that is performed by the SDK/Simantics SDK Jenkins job.
+
Review documentation
+
Documentation to review:
+
+
Developer wiki
+
End-user wiki
+
Member wiki
+
+
For each wiki page:
+
+
Read through and get authors to fix found problems, such as TODOs or invalid information.
+
+
Review tutorials
+
+
+
Ensure tutorial wiki documentation at http://dev.simantics.org/index.php/Tutorials is up-to-date with the released platform
+
+
+
Ensure tutorial projects and product build properly
+
+
+
com.acme.movie
+
+
Build with Buckminster, com.acme.movie.product.site.feature
+
+
+
+
Tag release/* branches
+
When the release branches are ready for the release, tag them with the tag vx.y.z[.w]:
+
git clone ssh://<user>@www.simantics.org:29418/simantics/platform.git +cd platform +git checkout release/x.y.z[.w] +git tag vx.y.z[.w] -m "Simantics x.y.z[.w] release" +git push origin --tags + +git clone ssh://<user>@www.simantics.org:29418/simantics/third-party.git +cd third-party +git checkout release/x.y.z[.w] +git tag vx.y.z[.w] -m "Simantics x.y.z[.w] release" +git push origin --tags +
+
+
Note The -m argument must be supplied to create an annotated tag. +Only annotated or signed tags can be pushed to Gerrit.
+
+
Backup documentation wiki databases
+
This step is only necessary for major/minor releases, not for service releases.
+
The wiki databases to be backed up are:
+
+
Developer wiki
+
End-user wiki
+
+
These are MediaWiki installations. The only sane way to "tag" the documentation +is to back up the mysql database backing the wiki. Should the wiki be required +at a later time for some reason, we'll put the documentation up then in a +separate Mediawiki installation.
+
+
Dump documentation wiki databases using [dump-wikis.sh](./dump-wikis.sh) script.
+
Put the generated backup x.y.z.tar.gz at /var/backup/simantics-releases/x.y.z/wiki/
+
+
Compile change log entry
+
+
Edit the main page and add a a link for release x.y.z[.w].
+
Open the change log page of the previous release, e.g. 1.25.0
+
Open the new link in another browser/tab to start editing the new wiki page
+
Edit the previous release's page and copy its wiki source contents over to the new release's page.
+
Fix the content to match the new release: +
+
Remove the issue content of the previous release
+
Fix release number, release date, release branch link and the link to all issues closed for the release +
+
Save new public issue query that lists all issues closed for the release by starting from the previous release's query
+
+
+
Add filter to query: Release Notes: Any to only show issues that have some content in their Release Notes field
+
Export closed issue list as CSV with selected columns only. Open the resulting CSV file in Excel.
+
Use Data -> Text to Columns with tab column separation to columnize the result
+
Format the list as a table so that there is only one issue / row
+
Remove all other columns besides: Issue #, Tracker, Release Notes
+
Format the data into a Textile table: +
+
Copy to table contents as text into PSPad
+
Replace (CTRL+H) tabs (\t) with | with Regular Expressions selection checked
+
Use Insert Text Into Lines.. (ALT-I) to fix line beginnings and ends: +
+
Text: +
+
At Lines Begin: |#
+
At Lines End: |
+
+
+
+
+
+
+
Copy the resulting textile table over to the change log page
+
+
+
Highlight major issues in the list by changing the text background color of the Type column: +
+
%{background: lightsalmon}Major Bug%
+
%{background: lightgreen}Major Feature%
+
%{background: lightgreen}Major Enhancement%
+
+
+
+
Disseminate information about the release
+
+
Developer Wiki: Update roadmap at http://dev.simantics.org/index.php/Roadmap
+
Redmine: Post news on the developer/user-visible changes here.
+
simantics.org: Post news on the release and a link to the redmine post
+
Members Wiki: Update frame plan to reflect the realized dates and link to Redmine news
+
mailto:simantics-developers@simantics.org Send "newsletter" to `simantics-developers@simantics.org:
+
+
Newsletter template:
+
Hello everyone, + +Simantics release x.y.z[.w] has been released. Head over to +https://www.simantics.org/redmine/news/<news number> +for the release news. + +Best regards, +Simantics Release Engineering Team +
+
Redmine news template:
+
Title: Simantics x.y.z[.w] released + +Simantics x.y.z[.w] was released on <date>. +Please find change log at: [[simantics-platform:Simantics_xyzw|Simantics x.y.z[.w]]] + +Insert some general thoughts on the release... +
+
+
TODO
+
+
Create a parametrized release train pipeline build in Jenkins that creates all artifacts of a simantics release +
+
Desktop, Sysdyn, R, Simupedia, FMIL, FMI Studio
+
+
+
+
+
+
Incorporate tutorial code in the platform repository as a separate folder to allow platform builds to directly ensure that the tutorial code still builds OK
+
+
+
Start using https://github.com/mbarbero/fr.obeo.releng.targetplatform to generate .target files. .tpd files allow specifying version ranges instead of specific versions.
+
+
+ + + + diff --git a/releng/doc/release.md b/releng/doc/release.md new file mode 100644 index 000000000..dbcc6dd86 --- /dev/null +++ b/releng/doc/release.md @@ -0,0 +1,247 @@ +# Definition of Done for Simantics Platform Releases + +1. The `simantics/platform` and `simantics/third-party` Git repositories have a branch `release/x.y.z[.w]` and tag `x.y.z[.w]`. +2. [A change log entry](https://www.simantics.org/redmine/projects/simantics-platform/wiki/ChangeLog) is compiled from the issues in this release and made available to the general public separately for the platform and for the open products included in the release train. +3. [Roadmap](http://dev.simantics.org/index.php/Roadmap) is up-to-date. +4. [Tutorials](http://dev.simantics.org/index.php/Tutorials) are up-to-date and coherent with the platform. +5. For all new major/minor releases, Wiki documentation is backed up (cloned). + +---- + +# Simantics Platform Release Process + +* Create `release/x.y.z[.w]` release stabilisation branch +* Repeat until stable: + * Develop, test and document components and test products +* Tag the release in repository +* Backup documentation wiki databases +* Build and publish SDK package with and without sources + * Does not really require any work +* Build Simantics open source products and plug-in components which are a part of the release train +* Update websites to reflect the new release + +---- + +# Released Plug-in Components and Products + +There are both plug-in components and products that are part of the "Simantics release train" that shall be released simultaneously to a major or minor Simantics release. + +Plug-in components are installable features that are deployed online as P2 repositories for general availability. Products are deployed as ZIP files and made available online in designated locations on simantics.org. + +Products that are part of the release train: +* Simantics Desktop +* Simantics System Dynamics Tool - [simantics/sysdyn.git](https://www.simantics.org:8088/r/gitweb?p=simantics/sysdyn.git;a=summary) + +Plug-in components that are part of the release train: +* Simantics R - [simantics/r.git](https://www.simantics.org:8088/r/gitweb?p=simantics/r.git;a=summary) +* FMIL - [simantics/fmil.git](https://www.simantics.org:8088/r/gitweb?p=simantics/fmil.git;a=summary) +* FMI Studio - [members/fmi.git](https://www.simantics.org:8088/r/gitweb?p=members/fmi.git;a=summary) +* Simupedia - [Members SVN](https://www.simantics.org/svn/members/simupedia) + +For simplicity, each of these components are versioned accoring to platform versioning, i.e. for Platform SDK 1.26.0 there will be Simantics Desktop 1.26.0, Sysdyn 1.26.0, and so on. + +---- + +# Release Schedule + +* Releases are branched 4 weeks before the set release date. +* During this time no more new features are allowed in the release branch and the existing work shall be stabilized. Work must be focused on bug fixes and documentation. +* Source code changes to release branches are forbidden in the last 2 weeks. Documentation-only changes are still allowed. However, if critical show-stopper problems surface during that time, the changes must be done. After that the release engineering team must decide whether to stick to the original release schedule or whether to delay the release. + +---- + +# Simantics Platform Release - Step by Step + +## Create release branch from selected commit + +When release stabilisation starts, branch `simantics/platform` and `simantics/third-party` repositories: + + git clone ssh://@www.simantics.org:29418/simantics/platform.git + cd platform + git branch release/x.y.z[.w] + git push origin release/x.y.z[.w] + + git clone ssh://@www.simantics.org:29418/simantics/third-party.git + cd third-party + git branch release/x.y.z[.w] + git push origin release/x.y.z[.w] + +When creating major/minor releases `` is usually a commit in the `master` branch. +With service releases, branch from an existing `release/*` branch instead. + +## Prepare release branch for use + +### Prepare .target files + +1. Retrieve release branch of the platform repository + + git clone ssh://@www.simantics.org:29418/simantics/platform.git + cd platform + git branch release/x.y.z[.w] remotes/origin/release/x.y.z[.w] + git checkout release/x.y.z[.w] + +2. Edit all target platform files in `releng/org.simantics.sdk.build.targetdefinition/`, i.e. + * `simantics.target` + * `org.simantics.sdk.build.targetdefinition.target` + + At the beginning of simantics.target file, increment `sequenceNumber` by 1 + ~~~ + + + + ~~~ + + Next, replace the following rows in both mentioned files: + + ~~~ + + + + ~~~ + + with + + ~~~ + + + + ~~~ + +### Initialize release branch distribution web site + +* Run [SDK/Deploy External Components to Web](https://www.simantics.org/jenkins/job/SDK/job/Deploy%20External%20Components%20to%20Web/) build with parameters: + * **GERRIT_REFNAME:** `release/x.y.z[.w]` + * **PUBLISH_ARTIFACTS:** `true` +* Run the [SDK/Simantics SDK](https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/) build with parameters: + * **GERRIT_REFNAME:** `release/x.y.z[.w]` + * **PUBLISH_ARTIFACTS:** `true` + +Running these two builds will ensure that both the external components required to build the SDK and the Simantics SDK for the new release branch are published online at `http://www.simantics.org/download/release/x.y.z[.w]/`. + +After this, whenever changes are pushed/merged to `release/x.y.z[.w]` branch in Gerrit, new **SDK/Simantics SDK** builds are triggered automatically and they will publish the results at the same location online. + +This means that one does not have to do any tricks after this to build and publish the SDK as a P2 repository online. It is an automated process that is performed by the [SDK/Simantics SDK](https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/) Jenkins job. + +## Review documentation + +Documentation to review: +* [Developer wiki](http://dev.simantics.org/) +* [End-user wiki](https://www.simantics.org/end_user_wiki) +* [Member wiki](https://www.simantics.org/members) + +For each wiki page: +* Read through and get authors to fix found problems, such as TODOs or invalid information. + +## Review tutorials + +* Ensure tutorial wiki documentation at http://dev.simantics.org/index.php/Tutorials is up-to-date with the released platform +* Ensure tutorial projects and product build properly + +* com.acme.movie + - Build with Buckminster, com.acme.movie.product.site.feature + +## Tag release/* branches + +When the release branches are ready for the release, tag them with the tag `vx.y.z[.w]`: + + git clone ssh://@www.simantics.org:29418/simantics/platform.git + cd platform + git checkout release/x.y.z[.w] + git tag vx.y.z[.w] -m "Simantics x.y.z[.w] release" + git push origin --tags + + git clone ssh://@www.simantics.org:29418/simantics/third-party.git + cd third-party + git checkout release/x.y.z[.w] + git tag vx.y.z[.w] -m "Simantics x.y.z[.w] release" + git push origin --tags + +> Note The -m argument must be supplied to create an [annotated tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging). +> Only annotated or signed tags can be pushed to Gerrit. + +## Backup documentation wiki databases + +This step is only necessary for major/minor releases, not for service releases. + +The wiki databases to be backed up are: +* [Developer wiki](http://dev.simantics.org/) +* [End-user wiki](https://www.simantics.org/end_user_wiki) + +These are MediaWiki installations. The only sane way to "tag" the documentation +is to back up the mysql database backing the wiki. Should the wiki be required +at a later time for some reason, we'll put the documentation up then in a +separate Mediawiki installation. + +1. Dump documentation wiki databases using [dump-wikis.sh](./dump-wikis.sh) script. +2. Put the generated backup x.y.z.tar.gz at /var/backup/simantics-releases/x.y.z/wiki/ + +## Compile change log entry + +* Edit the [main page](https://www.simantics.org/redmine/projects/simantics-platform/wiki/ChangeLog) and add a a link for release x.y.z[.w]. +* Open the change log page of the previous release, e.g. [1.25.0](https://www.simantics.org/redmine/projects/simantics-platform/wiki/Simantics_1250) +* Open the new link in another browser/tab to start editing the new wiki page +* Edit the previous release's page and copy its wiki source contents over to the new release's page. +* Fix the content to match the new release: + * Remove the issue content of the previous release + * Fix release number, release date, release branch link and the link to all issues closed for the release + * Save new public issue query that lists all issues closed for the release by [starting from the previous release's query](https://www.simantics.org/redmine/projects/simantics-platform/issues?query_id=122) + * Add filter to query: **Release Notes: Any** to only show issues that have some content in their Release Notes field + * Export closed issue list as CSV with selected columns only. Open the resulting CSV file in Excel. + * Use **Data -> Text to Columns** with tab column separation to columnize the result + * Format the list as a table so that there is only one issue / row + * Remove all other columns besides: Issue #, Tracker, Release Notes + * Format the data into a Textile table: + * Copy to table contents as text into [PSPad](http://www.pspad.com/) + * Replace (CTRL+H) tabs (`\t`) with `|` with `Regular Expressions` selection checked + * Use **Insert Text Into Lines..** (ALT-I) to fix line beginnings and ends: + * Text: + * At Lines Begin: `|#` + * At Lines End: `|` + * Copy the resulting textile table over to the change log page +* Highlight major issues in the list by changing the text background color of the **Type** column: + * `%{background: lightsalmon}Major Bug%` + * `%{background: lightgreen}Major Feature%` + * `%{background: lightgreen}Major Enhancement%` + +## Disseminate information about the release + +* [Developer Wiki](http://dev.simantics.org): Update roadmap at http://dev.simantics.org/index.php/Roadmap +* [Redmine](https://www.simantics.org/redmine/): Post news on the developer/user-visible changes here. +* [simantics.org](https://www.simantics.org): Post news on the release and a link to the redmine post +* [Members Wiki](https://www.simantics.org/members/): Update frame plan to reflect the realized dates and link to Redmine news +* [mailto:simantics-developers@simantics.org](mailto:simantics-developers@simantics.org) Send "newsletter" to `simantics-developers@simantics.org: + +**Newsletter template:** +~~~ +Hello everyone, + +Simantics release x.y.z[.w] has been released. Head over to +https://www.simantics.org/redmine/news/ +for the release news. + +Best regards, +Simantics Release Engineering Team +~~~ + +**Redmine news template:** +~~~ +Title: Simantics x.y.z[.w] released + +Simantics x.y.z[.w] was released on . +Please find change log at: [[simantics-platform:Simantics_xyzw|Simantics x.y.z[.w]]] + +Insert some general thoughts on the release... +~~~ + +---- + +# TODO + +* Create a parametrized release train pipeline build in Jenkins that creates all artifacts of a simantics release + * Desktop, Sysdyn, R, Simupedia, FMIL, FMI Studio + + +* Incorporate tutorial code in the platform repository as a separate folder to allow platform builds to directly ensure that the tutorial code still builds OK + +* Start using https://github.com/mbarbero/fr.obeo.releng.targetplatform to generate `.target` files. `.tpd` files allow specifying version ranges instead of specific versions. + diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index bdb30e190..828ae537f 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -6,7 +6,7 @@ org.simantics org.simantics.sdk.build.p2.site pom - 1.25.0 + 1.26.0 2.1.7.b1 diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target similarity index 92% rename from releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target rename to releng/org.simantics.sdk.build.targetdefinition/simantics.target index e42b58148..5587c81a7 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,221 +1,227 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.sdk.repository/category.xml b/releng/org.simantics.sdk.repository/category.xml index f97fc7574..64051231a 100644 --- a/releng/org.simantics.sdk.repository/category.xml +++ b/releng/org.simantics.sdk.repository/category.xml @@ -1,6 +1,9 @@ - + + + + diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml index 5731d5fd6..af6b817ef 100644 --- a/releng/org.simantics.sdk.repository/pom.xml +++ b/releng/org.simantics.sdk.repository/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.simantics.sdk.repository - 1.25.0-SNAPSHOT + 1.26.0-SNAPSHOT eclipse-repository diff --git a/releng/org.simantics.target/.htpasswd b/releng/org.simantics.target/.htpasswd deleted file mode 100644 index e47a33fe6..000000000 --- a/releng/org.simantics.target/.htpasswd +++ /dev/null @@ -1,2 +0,0 @@ -member:ng8YuO16fR2C. -anonymous:G2JhW8U3GQYUU diff --git a/releng/org.simantics.target/.project b/releng/org.simantics.target/.project deleted file mode 100644 index 9a8cec5ad..000000000 --- a/releng/org.simantics.target/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.simantics.target - - - - - - - - diff --git a/releng/org.simantics.target/rmap/Modelica.rmap b/releng/org.simantics.target/rmap/Modelica.rmap deleted file mode 100644 index eb69d0bce..000000000 --- a/releng/org.simantics.target/rmap/Modelica.rmap +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.target/rmap/SDK.rmap b/releng/org.simantics.target/rmap/SDK.rmap deleted file mode 100644 index 30cba0d39..000000000 --- a/releng/org.simantics.target/rmap/SDK.rmap +++ /dev/null @@ -1,701 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.target/rmap/Simantics.rmap b/releng/org.simantics.target/rmap/Simantics.rmap deleted file mode 100644 index da0e1ec2a..000000000 --- a/releng/org.simantics.target/rmap/Simantics.rmap +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.target/rmap/Sysdyn.rmap b/releng/org.simantics.target/rmap/Sysdyn.rmap deleted file mode 100644 index 516361659..000000000 --- a/releng/org.simantics.target/rmap/Sysdyn.rmap +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.target/rmap/Tutorials.rmap b/releng/org.simantics.target/rmap/Tutorials.rmap deleted file mode 100644 index fc42e335c..000000000 --- a/releng/org.simantics.target/rmap/Tutorials.rmap +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.target/simantics.target b/releng/org.simantics.target/simantics.target deleted file mode 100644 index 789164029..000000000 --- a/releng/org.simantics.target/simantics.target +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml index 5e874e6a6..a6b0ce2fa 100644 --- a/releng/org.simantics.tycho.configuration/pom.xml +++ b/releng/org.simantics.tycho.configuration/pom.xml @@ -8,8 +8,8 @@ pom - 0.25.0 - 0.25.0 + 0.26.0 + 0.26.0 UTF-8 http://download.eclipse.org/releases/mars @@ -32,6 +32,11 @@ ${tycho.version} true + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + org.eclipse.tycho tycho-packaging-plugin @@ -85,6 +90,11 @@ + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho.extras.version} + diff --git a/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF b/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF index 5caaeecbd..710abbf56 100644 --- a/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF +++ b/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF @@ -6,7 +6,10 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", org.simantics.scl.compiler;bundle-version="0.5.0", - org.simantics.scl.osgi;bundle-version="1.0.4", gnu.trove3, + org.simantics.scl.osgi;bundle-version="1.0.4", org.objectweb.asm.util, + ch.qos.logback.classic;bundle-version="1.1.7", + ch.qos.logback.core;bundle-version="1.1.7", + org.apache.commons.collections;bundle-version="3.2.2", org.eclipse.equinox.ds;bundle-version="1.4.300" diff --git a/tests/org.simantics.scl.compiler.tests/logback.xml b/tests/org.simantics.scl.compiler.tests/logback.xml new file mode 100644 index 000000000..dfa60de91 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/logback.xml @@ -0,0 +1,18 @@ + + + + + + + %-5p [%d] %c: %m%n%rEx + + + + + + + + + + + \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ActiveTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ActiveTests.java index f9533efee..7a4f8cda2 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ActiveTests.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ActiveTests.java @@ -1,6 +1,5 @@ package org.simantics.scl.compiler.tests; -import org.junit.Ignore; import org.junit.Test; public class ActiveTests extends TestBase { @@ -20,5 +19,4 @@ public class ActiveTests extends TestBase { */ //@Test public void CityoptSetup() { test(); } - @Test public void EmptyLet() { test(); } } diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/TestActive.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/AllTestsForCoverage.java similarity index 51% rename from bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/TestActive.java rename to tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/AllTestsForCoverage.java index 8a22ba9db..1e640c64d 100644 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/TestActive.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/AllTestsForCoverage.java @@ -1,12 +1,16 @@ -package org.simantics.scl.compiler.tests; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ - ActiveTests.class -}) -public class TestActive { -} +package org.simantics.scl.compiler.tests; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.simantics.scl.compiler.tests.markdown.MarkdownTests; + +@RunWith(Suite.class) +@SuiteClasses({ + TestRegression.class, + ActiveTests.class, + MarkdownTests.class +}) +public class AllTestsForCoverage { + +} diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java index 44d05ac08..347191a3f 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java @@ -1,14 +1,7 @@ package org.simantics.scl.compiler.tests; -import org.junit.AfterClass; -import org.junit.Ignore; import org.junit.Test; -import org.simantics.scl.compiler.errors.Failable; -import org.simantics.scl.compiler.module.Module; -import org.simantics.scl.compiler.module.coverage.CoverageUtils; -import org.simantics.scl.compiler.module.coverage.ModuleCoverage; import org.simantics.scl.compiler.top.ValueNotFound; -import org.simantics.scl.runtime.profiling.BranchPoint; public class ModuleRegressionTests extends TestBase { @@ -28,6 +21,7 @@ public class ModuleRegressionTests extends TestBase { @Test public void ClashingData() { test(); } @Test public void ClashingInstance() { test(); } @Test public void ClashingValueType() { test(); } + @Test public void ClosingBrace() { test(); } @Test public void Collaz() { test(); } @Test public void Compose() { test(); } @Test public void Composition() { test(); } @@ -47,6 +41,7 @@ public class ModuleRegressionTests extends TestBase { @Test public void Effects4() { test(); } @Test public void Effects5() { test(); } @Test public void Effects6() { test(); } + @Test public void EmptyLet() { test(); } @Test(expected=ValueNotFound.class) public void EmptyModule() throws ValueNotFound { test(new String[]{"EmptyModule"}, new String[]{""}); @@ -60,14 +55,12 @@ public class ModuleRegressionTests extends TestBase { @Test public void Fibonacci2() { test(); } @Test public void Fibonacci3() { test(); } @Test public void FingerTree() { test(); } - @Ignore - @Test public void FoldMissingInitialValue() { test(); } @Test public void FoldlBuild1() { test(); } @Test public void FoldlBuild2() { test(); } + @Test public void FoldMissingInitialValue() { test(); } @Test public void Forall1() { test(); } @Test public void Forall2() { test(); } @Test public void Forall3() { test(); } - @Ignore @Test public void Formula() { test(); } @Test public void FromDynamic() { test(); } @Test public void FromDynamic2() { test(); } @@ -83,7 +76,8 @@ public class ModuleRegressionTests extends TestBase { @Test public void GuardedExpressionBug() { test(); } @Test public void Guards1() { test(); } @Test public void Guards2() { test(); } - @Test public void IdAsOperator() { test(); } + @Test public void IdAsOperator() { test(); } + //@Test public void IfWithoutElse() { test(); } @Test public void IllegalChar() { test(); } @Test public void ImportJavaConstructor() { test(); } @Test public void ImportRef() { test(); } @@ -114,10 +108,11 @@ public class ModuleRegressionTests extends TestBase { @Test public void JavaTypes() { test(); } @Test public void Kinds1() { test(); } @Test public void Lambda() { test(); } + @Test public void LambdaMatch() { test(); } @Test public void Layout1() { test(); } @Test public void List() { test(); } - @Test public void ListError1() { test(); } - @Test public void ListError2() { test(); } + @Test public void ListError1() { test(); } + @Test public void ListError2() { test(); } @Test public void ListSyntax() { test(); } @Test public void ListSyntax10() { test(); } @Test public void ListSyntax11() { test(); } @@ -139,8 +134,8 @@ public class ModuleRegressionTests extends TestBase { @Test public void Macros1() { test(); } @Test public void Macros2() { test(); } @Test public void Macros4() { test(); } - @Test public void Map1() { test(); } - @Test public void MarketModel() { test(); } + @Test public void Map1() { test(); } + @Test public void MarketModel() { test(); } @Test public void Matching() { test(); } @Test public void Matching2() { test(); } @Test public void Matching4() { test(); } @@ -149,35 +144,34 @@ public class ModuleRegressionTests extends TestBase { @Test public void MatchingWithoutTypeAnnotations() { test(); } @Test public void MaximumBy() { test(); } @Test public void Maybe1() { test(); } - @Test public void Maybe2() { test(); } - @Test public void Maybe3() { test(); } + @Test public void Maybe2() { test(); } + @Test public void Maybe3() { test(); } @Test public void Maybe4() { test(); } @Test public void MissingEffect() { test(); } @Test public void MissingMethod() { test(); } @Test public void ModuleInitialization() { test(); } @Test public void MonadBug1() { test(); } - @Test public void MonadSyntax1() { test(); } @Test public void Monads1() { test(); } - @Test public void NoDefinitionErrorMessage() { test(); } + @Test public void MonadSyntax1() { test(); } + @Test public void NoDefinitionErrorMessage() { test(); } @Test public void NoInstance() { test(); } @Test public void NoInstance2() { test(); } @Test public void NonassociativeOperator() { test(); } @Test public void NonexistentTypeClassInAnnotation() { test(); } - @Test public void NonexistingEffect() { test(); } - @Test public void OneLineMatch() { test(); } + @Test public void NonexistingEffect() { test(); } + @Test public void OneLineMatch() { test(); } @Test public void OpenString1() { test(); } @Test public void OpenString2() { test(); } @Test public void OverloadedArithmetic1() { test(); } @Test public void OverloadedArithmetic2() { test(); } @Test public void OverloadedArithmetic3() { test(); } @Test public void OverloadedLiterals2() { test(); } - @Ignore - @Test public void Overloading1() { test(); } - @Test public void Parsing() { test(); } + @Test public void Overloading1() { test(); } + @Test public void Parsing() { test(); } @Test public void PolymorphicRecursion() { test(); } @Test public void PolymorphicRecursion2() { test(); } - @Test public void Polynomials() { test(); } - @Test public void PrecedenceOfNonoperators() { test(); } + @Test public void Polynomials() { test(); } + @Test public void PrecedenceOfNonoperators() { test(); } @Test public void Primes() { test(); } @Test public void Proc1() { test(); } @Test public void Proc2() { test(); } @@ -193,9 +187,8 @@ public class ModuleRegressionTests extends TestBase { @Test public void RecursiveValues4() { test(); } @Test public void RedBlackTrees() { test(); } @Test public void Relations1() { test(); } - @Test public void Relations2() { test(); } - @Test public void RepeatedVariableInPattern() { test(); } - @Test public void SSATypingBug() { test(); } + @Test public void Relations2() { test(); } + @Test public void RepeatedVariableInPattern() { test(); } @Test public void Scanl() { test(); } @Test public void Search() { test(); } @Test public void Sections() { test(); } @@ -211,16 +204,20 @@ public class ModuleRegressionTests extends TestBase { @Test public void SelfReferringContextInTypeClass() { test(); } @Test public void Serialization2() { test(); } @Test public void Serialization3() { test(); } + @Test public void Serialization4() { test(); } @Test public void SharedTypeVariable() { test(); } @Test public void ShortcutFusion() { test(); } @Test public void Show1() { test(); } @Test public void SinConst1() { test(); } @Test public void Sort() { test(); } @Test public void Sort2() { test(); } + @Test public void SSATypingBug() { test(); } @Test public void StreamFusion() { test(); } @Test public void StringEscape() { test(); } @Test public void StringInterpolation1() { test(); } - @Test public void StringMatching1() { test(); } + @Test public void StringInterpolation2() { test(); } + @Test public void StringInterpolation3() { test(); } + @Test public void StringMatching1() { test(); } @Test public void SumOfInverses2() { test(); } @Test public void TooManyParametersToSin() { test(); } @Test public void Transformation1() { test(); } @@ -239,8 +236,8 @@ public class ModuleRegressionTests extends TestBase { @Test public void TypeAliasRefsToTypeAlias() { test(); } @Test public void TypeAnnotation1() { test(); } @Test public void TypeAnnotation2() { test(); } - @Test public void TypeClass() { test(); } - @Test public void TypeClassBug1() { test(); } + @Test public void TypeClass() { test(); } + @Test public void TypeClassBug1() { test(); } @Test(timeout=1000L) public void TypeInferenceBug2() { test(); } @Test public void TypeOf1() { test(); } @Test public void TypingBug1() { test(); } @@ -252,23 +249,25 @@ public class ModuleRegressionTests extends TestBase { @Test public void Unification1() { test(); } @Test public void UnknownAnnotation() { test(); } @Test public void UnresolvedClass() { test(); } - @Test public void UnresolvedTypeInAnnotation() { test(); } - @Test public void UnresolvedTypeInInstance() { test(); } - @Test public void UnresolvedVariable() { test(); } - @Test public void UnresolvedVariable2() { test(); } + @Test public void UnresolvedTypeInAnnotation() { test(); } + @Test public void UnresolvedTypeInInstance() { test(); } + @Test public void UnresolvedVariable() { test(); } + @Test public void UnresolvedVariable2() { test(); } @Test public void ValueAsOperator() { test(); } @Test public void ValueConversion() { test(); } @Test public void Vector1() { test(); } @Test public void Vector2() { test(); } + @Test public void ViewPatterns1() { test(); } @Test public void Void1() { test(); } @Test public void Void2() { test(); } @Test public void Void3() { test(); } - @Test public void While() { test(); } + @Test public void While() { test(); } @Test public void While2() { test(); } - @Test public void While3() { test(); } + @Test public void While3() { test(); } @Test public void WrongDefaultMethod() { test(); } @Test public void WrongInstanceMethod() { test(); } + /* @AfterClass public static void checkCoverage() { Failable maybeModule = PRELUDE_MODULE_REPOSITORY.getModule("Prelude"); @@ -289,6 +288,6 @@ public class ModuleRegressionTests extends TestBase { System.out.println(bp.getCodeSize()); printCoverageTree(bp.getChildren(), ind+1); } - } + }*/ } diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestBase.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestBase.java index 05ffd759f..2dfaafee3 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestBase.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestBase.java @@ -16,9 +16,7 @@ import org.simantics.scl.compiler.module.repository.ModuleRepository; import org.simantics.scl.compiler.module.repository.UpdateListener; import org.simantics.scl.compiler.source.ModuleSource; import org.simantics.scl.compiler.source.StringModuleSource; -import org.simantics.scl.compiler.source.repository.CompositeModuleSourceRepository; import org.simantics.scl.compiler.source.repository.MapModuleSourceRepository; -import org.simantics.scl.compiler.source.repository.SourceRepositories; import org.simantics.scl.compiler.top.ValueNotFound; public class TestBase { diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestClassNaming.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestClassNaming.java index 283e0e14e..edd7df645 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestClassNaming.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestClassNaming.java @@ -1,5 +1,6 @@ package org.simantics.scl.compiler.tests; +import org.junit.Assert; import org.junit.Test; import org.simantics.scl.compiler.elaboration.java.Builtins; import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification; @@ -13,8 +14,6 @@ import org.simantics.scl.compiler.source.repository.MapModuleSourceRepository; import org.simantics.scl.compiler.source.repository.ModuleSourceRepository; import org.simantics.scl.compiler.top.ExpressionEvaluator; -import junit.framework.Assert; - public class TestClassNaming { private static class SimpleModuleSource extends StringModuleSource { diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestCommandSession.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestCommandSession.java index b86f097b8..4a9bffd09 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestCommandSession.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestCommandSession.java @@ -4,8 +4,6 @@ import org.junit.Before; import org.junit.Test; import org.simantics.scl.compiler.commands.CommandSession; import org.simantics.scl.compiler.module.repository.ModuleRepository; -import org.simantics.scl.compiler.source.repository.CompositeModuleSourceRepository; -import org.simantics.scl.compiler.source.repository.SourceRepositories; import org.simantics.scl.runtime.reporting.AbstractSCLReportingHandler; import org.simantics.scl.runtime.reporting.SCLReportingHandler; diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java index e143c6ab9..2e887ca1a 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java @@ -2,6 +2,7 @@ package org.simantics.scl.compiler.tests; import java.util.Arrays; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.simantics.scl.compiler.elaboration.expressions.EVariable; @@ -25,8 +26,6 @@ import org.simantics.scl.compiler.types.Types; import org.simantics.scl.runtime.function.Function; import org.simantics.scl.runtime.tuple.Tuple0; -import junit.framework.Assert; - public class TestExpressionEvaluator { public static final boolean TIMING = false; diff --git a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/markdown/RunMarkdownTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/MarkdownTests.java similarity index 92% rename from bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/markdown/RunMarkdownTests.java rename to tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/MarkdownTests.java index 9971a020b..5c4e120bf 100644 --- a/bundles/org.simantics.scl.compiler/tests/org/simantics/scl/compiler/tests/markdown/RunMarkdownTests.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/MarkdownTests.java @@ -1,100 +1,102 @@ -package org.simantics.scl.compiler.tests.markdown; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.StringReader; -import java.nio.charset.Charset; - -import org.simantics.scl.compiler.markdown.internal.MarkdownParser; -import org.simantics.scl.compiler.markdown.nodes.Node; - -public class RunMarkdownTests { - - public static int FAILED = 0; - public static int SUCCEEDED = 1; - public static int SKIPPED = 2; - - public static void main(String[] args) throws IOException { - BufferedReader reader = new BufferedReader( - new InputStreamReader( - RunMarkdownTests.class.getResourceAsStream("spec.txt"), - Charset.forName("UTF-8"))); - - StringBuilder in = new StringBuilder(); - StringBuilder out = new StringBuilder(); - int state = 0; - int testId = 0; - int passed = 0; - int failed = 0; - int skipped = 0; - while(true) { - String line = reader.readLine(); - if(line == null) - break; - switch(state) { - case 0: - if(line.equals("```````````````````````````````` example")) - ++state; - break; - case 1: - if(line.equals(".")) - ++state; - else { - if(in.length() > 0) - in.append('\n'); - in.append(line); - } - break; - case 2: - if(line.equals("````````````````````````````````")) { - ++testId; - int status = test(testId, in.toString(), out.toString()); - if(status == SUCCEEDED) - ++passed; - else if(status == FAILED) - ++failed; - else - ++skipped; - in = new StringBuilder(); - out = new StringBuilder(); - state = 0; - } - else { - if(out.length() > 0) - out.append('\n'); - out.append(line); - } - break; - } - } - - System.out.println("Passed: " + passed + "/" + testId); - System.out.println("Failed: " + failed + "/" + testId); - System.out.println("Skipped: " + skipped + "/" + testId); - } - - public static int test(int id, String in, String out) throws IOException { - MarkdownParser parser = new MarkdownParser(); - Node node = parser.parseDocument(new StringReader(in.replace('\u2192', '\t'))); - - String result = node.toHtml().replace('\t', '\u2192'); - - boolean passed = result.equals(out); - - if(!passed) { - System.out.println("Example " + id); // + (passed ? " passed" : " failed")); - System.out.println("---- in --------------------------------------------------------------------"); - System.out.println(in); - System.out.println("---- expected --------------------------------------------------------------"); - System.out.println(out); - System.out.println("---- actual ----------------------------------------------------------------"); - System.out.println(result); - System.out.println("----------------------------------------------------------------------------"); - System.out.println(); - } - - return passed ? SUCCEEDED : FAILED; - } - -} +package org.simantics.scl.compiler.tests.markdown; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.nio.charset.Charset; + +import org.junit.Test; +import org.simantics.scl.compiler.markdown.internal.MarkdownParser; +import org.simantics.scl.compiler.markdown.nodes.Node; + +public class MarkdownTests { + + public static int FAILED = 0; + public static int SUCCEEDED = 1; + public static int SKIPPED = 2; + + @Test + public void markdownTests() throws IOException { + BufferedReader reader = new BufferedReader( + new InputStreamReader( + MarkdownTests.class.getResourceAsStream("spec.txt"), + Charset.forName("UTF-8"))); + + StringBuilder in = new StringBuilder(); + StringBuilder out = new StringBuilder(); + int state = 0; + int testId = 0; + int passed = 0; + int failed = 0; + int skipped = 0; + while(true) { + String line = reader.readLine(); + if(line == null) + break; + switch(state) { + case 0: + if(line.equals("```````````````````````````````` example")) + ++state; + break; + case 1: + if(line.equals(".")) + ++state; + else { + if(in.length() > 0) + in.append('\n'); + in.append(line); + } + break; + case 2: + if(line.equals("````````````````````````````````")) { + ++testId; + int status = test(testId, in.toString(), out.toString()); + if(status == SUCCEEDED) + ++passed; + else if(status == FAILED) + ++failed; + else + ++skipped; + in = new StringBuilder(); + out = new StringBuilder(); + state = 0; + } + else { + if(out.length() > 0) + out.append('\n'); + out.append(line); + } + break; + } + } + + System.out.println("Passed: " + passed + "/" + testId); + System.out.println("Failed: " + failed + "/" + testId); + System.out.println("Skipped: " + skipped + "/" + testId); + } + + public static int test(int id, String in, String out) throws IOException { + MarkdownParser parser = new MarkdownParser(); + Node node = parser.parseDocument(new StringReader(in.replace('\u2192', '\t'))); + + String result = node.toHtml().replace('\t', '\u2192'); + + boolean passed = result.equals(out); + + if(!passed) { + System.out.println("Example " + id); // + (passed ? " passed" : " failed")); + System.out.println("---- in --------------------------------------------------------------------"); + System.out.println(in); + System.out.println("---- expected --------------------------------------------------------------"); + System.out.println(out); + System.out.println("---- actual ----------------------------------------------------------------"); + System.out.println(result); + System.out.println("----------------------------------------------------------------------------"); + System.out.println(); + } + + return passed ? SUCCEEDED : FAILED; + } + +} diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/RunMarkdownTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/RunMarkdownTests.java deleted file mode 100644 index 9971a020b..000000000 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/RunMarkdownTests.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.simantics.scl.compiler.tests.markdown; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.StringReader; -import java.nio.charset.Charset; - -import org.simantics.scl.compiler.markdown.internal.MarkdownParser; -import org.simantics.scl.compiler.markdown.nodes.Node; - -public class RunMarkdownTests { - - public static int FAILED = 0; - public static int SUCCEEDED = 1; - public static int SKIPPED = 2; - - public static void main(String[] args) throws IOException { - BufferedReader reader = new BufferedReader( - new InputStreamReader( - RunMarkdownTests.class.getResourceAsStream("spec.txt"), - Charset.forName("UTF-8"))); - - StringBuilder in = new StringBuilder(); - StringBuilder out = new StringBuilder(); - int state = 0; - int testId = 0; - int passed = 0; - int failed = 0; - int skipped = 0; - while(true) { - String line = reader.readLine(); - if(line == null) - break; - switch(state) { - case 0: - if(line.equals("```````````````````````````````` example")) - ++state; - break; - case 1: - if(line.equals(".")) - ++state; - else { - if(in.length() > 0) - in.append('\n'); - in.append(line); - } - break; - case 2: - if(line.equals("````````````````````````````````")) { - ++testId; - int status = test(testId, in.toString(), out.toString()); - if(status == SUCCEEDED) - ++passed; - else if(status == FAILED) - ++failed; - else - ++skipped; - in = new StringBuilder(); - out = new StringBuilder(); - state = 0; - } - else { - if(out.length() > 0) - out.append('\n'); - out.append(line); - } - break; - } - } - - System.out.println("Passed: " + passed + "/" + testId); - System.out.println("Failed: " + failed + "/" + testId); - System.out.println("Skipped: " + skipped + "/" + testId); - } - - public static int test(int id, String in, String out) throws IOException { - MarkdownParser parser = new MarkdownParser(); - Node node = parser.parseDocument(new StringReader(in.replace('\u2192', '\t'))); - - String result = node.toHtml().replace('\t', '\u2192'); - - boolean passed = result.equals(out); - - if(!passed) { - System.out.println("Example " + id); // + (passed ? " passed" : " failed")); - System.out.println("---- in --------------------------------------------------------------------"); - System.out.println(in); - System.out.println("---- expected --------------------------------------------------------------"); - System.out.println(out); - System.out.println("---- actual ----------------------------------------------------------------"); - System.out.println(result); - System.out.println("----------------------------------------------------------------------------"); - System.out.println(); - } - - return passed ? SUCCEEDED : FAILED; - } - -} diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/spec.txt b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/spec.txt index bdaed436d..92faa7302 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/spec.txt +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/markdown/spec.txt @@ -1,8 +1,8 @@ --- title: CommonMark Spec author: John MacFarlane -version: 0.25 -date: '2016-03-24' +version: 0.26 +date: '2016-07-15' license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)' ... @@ -13,12 +13,90 @@ license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)' Markdown is a plain text format for writing structured documents, based on conventions used for indicating formatting in email and usenet posts. It was developed in 2004 by John Gruber, who wrote -the first Markdown-to-HTML converter in perl, and it soon became -widely used in websites. By 2014 there were dozens of -implementations in many languages. Some of them extended basic -Markdown syntax with conventions for footnotes, definition lists, -tables, and other constructs, and some allowed output not just in -HTML but in LaTeX and many other formats. +the first Markdown-to-HTML converter in Perl, and it soon became +ubiquitous. In the next decade, dozens of implementations were +developed in many languages. Some extended the original +Markdown syntax with conventions for footnotes, tables, and +other document elements. Some allowed Markdown documents to be +rendered in formats other than HTML. Websites like Reddit, +StackOverflow, and GitHub had millions of people using Markdown. +And Markdown started to be used beyond the web, to author books, +articles, slide shows, letters, and lecture notes. + +What distinguishes Markdown from many other lightweight markup +syntaxes, which are often easier to write, is its readability. +As Gruber writes: + +> The overriding design goal for Markdown's formatting syntax is +> to make it as readable as possible. The idea is that a +> Markdown-formatted document should be publishable as-is, as +> plain text, without looking like it's been marked up with tags +> or formatting instructions. +> () + +The point can be illustrated by comparing a sample of +[AsciiDoc](http://www.methods.co.nz/asciidoc/) with +an equivalent sample of Markdown. Here is a sample of +AsciiDoc from the AsciiDoc manual: + +``` +1. List item one. ++ +List item one continued with a second paragraph followed by an +Indented block. ++ +................. +$ ls *.sh +$ mv *.sh ~/tmp +................. ++ +List item continued with a third paragraph. + +2. List item two continued with an open block. ++ +-- +This paragraph is part of the preceding list item. + +a. This list is nested and does not require explicit item +continuation. ++ +This paragraph is part of the preceding list item. + +b. List item b. + +This paragraph belongs to item two of the outer list. +-- +``` + +And here is the equivalent in Markdown: +``` +1. List item one. + + List item one continued with a second paragraph followed by an + Indented block. + + $ ls *.sh + $ mv *.sh ~/tmp + + List item continued with a third paragraph. + +2. List item two continued with an open block. + + This paragraph is part of the preceding list item. + + 1. This list is nested and does not require explicit item continuation. + + This paragraph is part of the preceding list item. + + 2. List item b. + + This paragraph belongs to item two of the outer list. +``` + +The AsciiDoc version is, arguably, easier to write. You don't need +to worry about indentation. But the Markdown version is much easier +to read. The nesting of list items is apparent to the eye in the +source, not just in the processed document. ## Why is a spec needed? @@ -258,9 +336,14 @@ the Unicode classes `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`. ## Tabs Tabs in lines are not expanded to [spaces]. However, -in contexts where indentation is significant for the -document's structure, tabs behave as if they were replaced -by spaces with a tab stop of 4 characters. +in contexts where whitespace helps to define block structure, +tabs behave as if they were replaced by spaces with a tab stop +of 4 characters. + +Thus, for example, a tab can be used instead of four spaces +in an indented code block. (Note, however, that internal +tabs are passed through as literal tabs, not expanded to +spaces.) ```````````````````````````````` example âfooâbazââbim @@ -269,7 +352,6 @@ by spaces with a tab stop of 4 characters.
```````````````````````````````` - ```````````````````````````````` example âfooâbazââbim . @@ -277,7 +359,6 @@ by spaces with a tab stop of 4 characters.
```````````````````````````````` - ```````````````````````````````` example aâa á½âa @@ -287,6 +368,9 @@ by spaces with a tab stop of 4 characters. ```````````````````````````````` +In the following example, a continuation paragraph of a list +item is indented with a tab; this has exactly the same effect +as indentation with four spaces would: ```````````````````````````````` example - foo @@ -315,6 +399,15 @@ by spaces with a tab stop of 4 characters. ```````````````````````````````` +Normally the `>` that begins a block quote may be followed +optionally by a space, which is not considered part of the +content. In the following case `>` is followed by a tab, +which is treated as if it were expanded into spaces. +Since one of theses spaces is considered part of the +delimiter, `foo` is considered to be indented six spaces +inside the block quote context, so we get an indented +code block starting with two spaces. + ```````````````````````````````` example >ââfoo . @@ -363,6 +456,17 @@ bar ```````````````````````````````` +```````````````````````````````` example +#âFoo +. +
Foo
+```````````````````````````````` + +```````````````````````````````` example +*â*â*â +. +
+```````````````````````````````` ## Insecure characters @@ -701,15 +805,6 @@ headings: ```````````````````````````````` -A tab will not work: - -```````````````````````````````` example -#âfoo -. -
#âfoo
-```````````````````````````````` - - This is not a heading, because the first `#` is escaped: ```````````````````````````````` example @@ -1890,7 +1985,7 @@ by their start and end conditions. The block begins with a line that meets a [start condition](@) (after up to three spaces optional indentation). It ends with the first subsequent line that meets a matching [end condition](@), or the last line of -the document, if no line is encountered that meets the +the document or other [container block]), if no line is encountered that meets the [end condition]. If the first line meets both the [start condition] and the [end condition], the block will contain just that line. @@ -1920,7 +2015,8 @@ followed by one of the strings (case-insensitive) `address`, `article`, `aside`, `base`, `basefont`, `blockquote`, `body`, `caption`, `center`, `col`, `colgroup`, `dd`, `details`, `dialog`, `dir`, `div`, `dl`, `dt`, `fieldset`, `figcaption`, `figure`, -`footer`, `form`, `frame`, `frameset`, `h1`, `head`, `header`, `hr`, +`footer`, `form`, `frame`, `frameset`, +`h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `head`, `header`, `hr`, `html`, `iframe`, `legend`, `li`, `link`, `main`, `menu`, `menuitem`, `meta`, `nav`, `noframes`, `ol`, `optgroup`, `option`, `p`, `param`, `section`, `source`, `summary`, `table`, `tbody`, `td`, @@ -2224,6 +2320,7 @@ import Text.HTML.TagSoup main :: IO () main = print $ parseTags tags +okay .
import Text.HTML.TagSoup @@ -2231,6 +2328,7 @@ import Text.HTML.TagSoup main :: IO () main = print $ parseTags tags
+
okay
```````````````````````````````` @@ -2242,12 +2340,14 @@ A script tag (type 1): document.getElementById("demo").innerHTML = "Hello JavaScript!"; +okay . +
okay
```````````````````````````````` @@ -2260,6 +2360,7 @@ h1 {color:red;} p {color:blue;} +okay . +
okay
```````````````````````````````` @@ -2355,11 +2457,13 @@ A comment (type 2): bar baz --> +okay . +
okay
```````````````````````````````` @@ -2372,12 +2476,14 @@ A processing instruction (type 3): echo '>'; ?> +okay . '; ?> +
okay
```````````````````````````````` @@ -2405,6 +2511,7 @@ function matchwo(a,b) } } ]]> +okay . +
okay
```````````````````````````````` @@ -3162,8 +3270,8 @@ Four spaces gives us a code block: ```````````````````````````````` -The Laziness clause allows us to omit the `>` before a -paragraph continuation line: +The Laziness clause allows us to omit the `>` before +[paragraph continuation text]: ```````````````````````````````` example > # Foo @@ -3269,8 +3377,8 @@ foo ```````````````````````````````` -Note that in the following case, we have a paragraph -continuation line: +Note that in the following case, we have a [lazy +continuation line]: ```````````````````````````````` example > foo @@ -3292,7 +3400,7 @@ To see why, note that in the `- bar` is indented too far to start a list, and can't be an indented code block because indented code blocks cannot -interrupt paragraphs, so it is a [paragraph continuation line]. +interrupt paragraphs, so it is [paragraph continuation text]. A block quote can be empty: @@ -3521,7 +3629,7 @@ The following rules define [list items]: 1. **Basic case.** If a sequence of lines *Ls* constitute a sequence of blocks *Bs* starting with a [non-whitespace character] and not separated from each other by more than one blank line, and *M* is a list - marker of width *W* followed by 0 < *N* < 5 spaces, then the result + marker of width *W* followed by 1 â¤ *N* â¤ 4 spaces, then the result of prepending *M* and the following spaces to the first line of *Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a list item with *Bs* as its contents. The type of the list item @@ -3529,6 +3637,12 @@ The following rules define [list items]: If the list item is ordered, then it is also assigned a start number, based on the ordered list marker. + Exceptions: When the first list item in a [list] interrupts + a paragraph---that is, when it starts on a line that would + otherwise count as [paragraph continuation text]---then (a) + the lines *Ls* must not begin with a blank line, and (b) if + the list item is ordered, the start number must be 1. + For example, let *Ls* be the lines ```````````````````````````````` example @@ -3703,66 +3817,20 @@ any following content, so these are not list items: ```````````````````````````````` -A list item may not contain blocks that are separated by more than -one blank line. Thus, two blank lines will end a list, unless the -two blanks are contained in a [fenced code block]. +A list item may contain blocks that are separated by more than +one blank line. ```````````````````````````````` example -- foo - - bar - - foo bar - -- ``` - foo - - - bar - ``` - -- baz - - + ``` - foo - - - bar - ``` .

foo

bar

-
-
foo
-
-
-
bar
-
-
-
foo - - -bar -
-
-
-
baz
-
-
-
foo - - -bar -
-
-
-

```````````````````````````````` @@ -3795,15 +3863,14 @@ A list item may contain any kind of block: A list item that contains an indented code block will preserve -empty lines within the code block verbatim, unless there are two -or more empty lines in a row (since as described above, two -blank lines end the list): +empty lines within the code block verbatim. ```````````````````````````````` example - Foo bar + baz .
@@ -3811,33 +3878,13 @@ blank lines end the list):
Foo

bar -baz -
- -
-```````````````````````````````` - -```````````````````````````````` example -- Foo - - bar - - - baz -. -
-
-
Foo
-
bar +baz

-
baz -
```````````````````````````````` - Note that ordered list start numbers must be nine digits or less: ```````````````````````````````` example @@ -4164,6 +4211,20 @@ A list may start or end with an empty list item: ```````````````````````````````` +However, an empty list item cannot interrupt a paragraph: + +```````````````````````````````` example +foo +* + +foo +1. +. +
foo +*
+
foo +1.
+```````````````````````````````` 4. **Indentation.** If a sequence of lines *Ls* constitutes a list item @@ -4361,13 +4422,18 @@ So, in this case we need two spaces indent: - foo - bar - baz + - boo .

foo

bar
-
baz
+
baz +
+
boo
+
+

@@ -4382,11 +4448,13 @@ One is not enough: - foo - bar - baz + - boo .

foo

bar

baz
+
boo

```````````````````````````````` @@ -4663,8 +4731,7 @@ takes four spaces (a common case), but diverge in other cases. A [list](@) is a sequence of one or more list items [of the same type]. The list items -may be separated by single [blank lines], but two -blank lines end all containing lists. +may be separated by any number of blank lines. Two list items are [of the same type](@) if they begin with a [list marker] of the same type. @@ -4739,33 +4806,28 @@ Foo
```````````````````````````````` - `Markdown.pl` does not allow this, through fear of triggering a list via a numeral in a hard-wrapped line: -```````````````````````````````` example +``` markdown The number of windows in my house is 14. The number of doors is 6. -. -
The number of windows in my house is
-
-
The number of doors is 6.
-
-```````````````````````````````` - +``` -Oddly, `Markdown.pl` *does* allow a blockquote to interrupt a paragraph, -even though the same considerations might apply. We think that the two -cases should be treated the same. Here are two reasons for allowing -lists to interrupt paragraphs: +Oddly, though, `Markdown.pl` *does* allow a blockquote to +interrupt a paragraph, even though the same considerations might +apply. -First, it is natural and not uncommon for people to start lists without -blank lines: +In CommonMark, we do allow lists to interrupt paragraphs, for +two reasons. First, it is natural and not uncommon for people +to start lists without blank lines: - I need to buy - - new shoes - - a coat - - a plane ticket +``` markdown +I need to buy +- new shoes +- a coat +- a plane ticket +``` Second, we are attracted to a @@ -4777,37 +4839,61 @@ Second, we are attracted to a (Indeed, the spec for [list items] and [block quotes] presupposes this principle.) This principle implies that if - * I need to buy - - new shoes - - a coat - - a plane ticket +``` markdown + * I need to buy + - new shoes + - a coat + - a plane ticket +``` is a list item containing a paragraph followed by a nested sublist, as all Markdown implementations agree it is (though the paragraph may be rendered without `
` tags, since the list is "tight"), then - I need to buy - - new shoes - - a coat - - a plane ticket +``` markdown +I need to buy +- new shoes +- a coat +- a plane ticket +``` by itself should be a paragraph followed by a nested sublist. -Our adherence to the [principle of uniformity] -thus inclines us to think that there are two coherent packages: +Since it is well established Markdown practice to allow lists to +interrupt paragraphs inside list items, the [principle of +uniformity] requires us to allow this outside list items as +well. ([reStructuredText](http://docutils.sourceforge.net/rst.html) +takes a different approach, requiring blank lines before lists +even inside other list items.) -1. Require blank lines before *all* lists and blockquotes, - including lists that occur as sublists inside other list items. +In order to solve of unwanted lists in paragraphs with +hard-wrapped numerals, we allow only lists starting with `1` to +interrupt paragraphs. Thus, -2. Require blank lines in none of these places. +```````````````````````````````` example +The number of windows in my house is +14. The number of doors is 6. +. +
The number of windows in my house is +14. The number of doors is 6.
+```````````````````````````````` -[reStructuredText](http://docutils.sourceforge.net/rst.html) takes -the first approach, for which there is much to be said. But the second -seems more consistent with established practice with Markdown. +We may still get an unintended result in cases like -There can be blank lines between items, but two blank lines end -a list: +```````````````````````````````` example +The number of windows in my house is +1. The number of doors is 6. +. +
The number of windows in my house is
+
+
The number of doors is 6.
+
+```````````````````````````````` + +but this rule should prevent most spurious list captures. + +There can be any number of blank lines between items: ```````````````````````````````` example - foo @@ -4824,36 +4910,12 @@ a list:

bar

- -
-
baz
-
-```````````````````````````````` - - -As illustrated above in the section on [list items], -two blank lines between blocks *within* a list item will also end a -list: - -```````````````````````````````` example -- foo - - - bar -- baz -. -
-
foo
-
-
bar
-
-
baz
+
+
baz
+

```````````````````````````````` - -Indeed, two blank lines will end *all* containing lists: - ```````````````````````````````` example - foo - bar @@ -4867,26 +4929,28 @@ Indeed, two blank lines will end *all* containing lists:

bar
-
baz
+
+
baz
+
bim
+

-
bim -
```````````````````````````````` -Thus, two blank lines can be used to separate consecutive lists of -the same type, or to separate a list from an indented code block -that would otherwise be parsed as a subparagraph of the final list -item: +To separate consecutive lists of the same type, or to separate a +list from an indented code block that would otherwise be parsed +as a subparagraph of the final list item, you can insert a blank HTML +comment: ```````````````````````````````` example - foo - bar + - baz - bim @@ -4895,6 +4959,7 @@ item:
foo

bar
+

baz

bim
@@ -4909,6 +4974,7 @@ item: - foo + code . @@ -4921,6 +4987,7 @@ item:
foo

+
code
```````````````````````````````` @@ -5611,6 +5678,16 @@ single spaces, just as they would be by a browser: ```````````````````````````````` +Not all [Unicode whitespace] (for instance, non-breaking space) is +collapsed, however: + +```````````````````````````````` example +`aÂ Â b` +. +
aÂ Â b
+```````````````````````````````` + + Q: Why not just leave the spaces, since browsers will collapse them anyway? A: Because we might be targeting a non-HTML format, and we shouldn't rely on HTML-specific rendering assumptions. @@ -5867,18 +5944,22 @@ The following rules define emphasis and strong emphasis: 9. Emphasis begins with a delimiter that [can open emphasis] and ends with a delimiter that [can close emphasis], and that uses the same - character (`_` or `*`) as the opening delimiter. There must - be a nonempty sequence of inlines between the open delimiter - and the closing delimiter; these form the contents of the emphasis - inline. + character (`_` or `*`) as the opening delimiter. The + opening and closing delimiters must belong to separate + [delimiter runs]. If one of the delimiters can both + open and close emphasis, then the sum of the lengths of the + delimiter runs containing the opening and closing delimiters + must not be a multiple of 3. 10. Strong emphasis begins with a delimiter that [can open strong emphasis] and ends with a delimiter that [can close strong emphasis], and that uses the same character - (`_` or `*`) as the opening delimiter. - There must be a nonempty sequence of inlines between the open - delimiter and the closing delimiter; these form the contents of - the strong emphasis inline. + (`_` or `*`) as the opening delimiter. The + opening and closing delimiters must belong to separate + [delimiter runs]. If one of the delimiters can both open + and close strong emphasis, then the sum of the lengths of + the delimiter runs containing the opening and closing + delimiters must not be a multiple of 3. 11. A literal `*` character cannot occur at the beginning or end of `*`-delimited emphasis or `**`-delimited strong emphasis, unless it @@ -5902,9 +5983,7 @@ the following principles resolve ambiguity: so that the second begins before the first ends and ends after the first ends, the first takes precedence. Thus, for example, `*foo _bar* baz_` is parsed as `foo _bar baz_` rather - than `*foo bar* baz`. For the same reason, - `**foo*bar**` is parsed as `foobar*` - rather than `foo*bar`. + than `*foo bar* baz`. 16. When there are two potential emphasis or strong emphasis spans with the same closing delimiter, the shorter one (the one that @@ -6077,10 +6156,8 @@ A newline also counts as whitespace: *foo bar * . -
*foo bar
-
-
-
+
*foo bar +*
```````````````````````````````` @@ -6484,18 +6561,30 @@ __foo_ bar_
foo bar baz
```````````````````````````````` - -But note: - ```````````````````````````````` example *foo**bar**baz* . -
foobarbaz
+
foobarbaz
```````````````````````````````` +Note that in the preceding case, the interpretation + +``` markdown +
foobarbaz
+``` + + +is precluded by the condition that a delimiter that +can both open and close (like the `*` after `foo`) +cannot form emphasis if the sum of the lengths of +the delimiter runs containing the opening and +closing delimiters is a multiple of 3. + +The same condition ensures that the following +cases are all strong emphasis nested inside +emphasis, even when the interior spaces are +omitted: -The difference is that in the preceding case, the internal delimiters -[can close emphasis], while in the cases with spaces, they cannot. ```````````````````````````````` example ***foo** bar* @@ -6511,18 +6600,13 @@ The difference is that in the preceding case, the internal delimiters ```````````````````````````````` -Note, however, that in the following case we get no strong -emphasis, because the opening delimiter is closed by the first -`*` before `bar`: - ```````````````````````````````` example *foo**bar*** . -
foobar**
+
foobar
```````````````````````````````` - Indefinite levels of nesting are possible: ```````````````````````````````` example @@ -6615,18 +6699,13 @@ ____foo__ bar__ ```````````````````````````````` -But note: - ```````````````````````````````` example **foo*bar*baz** . -
foobarbaz**
+
foobarbaz
```````````````````````````````` -The difference is that in the preceding case, the internal delimiters -[can close emphasis], while in the cases with spaces, they cannot. - ```````````````````````````````` example ***foo* bar** . @@ -6941,13 +7020,6 @@ Rule 15: ```````````````````````````````` -```````````````````````````````` example -**foo*bar** -. -
foobar*
-```````````````````````````````` - - ```````````````````````````````` example *foo __bar *baz bim__ bam* . @@ -7300,6 +7372,16 @@ may be used in titles: ```````````````````````````````` +Titles must be separated from the link using a [whitespace]. +Other [Unicode whitespace] like non-breaking space doesn't work. + +```````````````````````````````` example +[link](/urlÂ "title") +. +
link
+```````````````````````````````` + + Nested balanced quotes are not allowed without escaping: ```````````````````````````````` example @@ -7878,7 +7960,7 @@ consists of a [link label] that [matches] a [link reference definition] elsewhere in the document and is not followed by `[]` or a link label. The contents of the first link label are parsed as inlines, -which are used as the link's text. the link's URI and title +which are used as the link's text. The link's URI and title are provided by the matching link reference definition. Thus, `[foo]` is equivalent to `[foo][]`. @@ -7964,7 +8046,8 @@ following closing bracket: ```````````````````````````````` -Full references take precedence over shortcut references: +Full and compact references take precedence over shortcut +references: ```````````````````````````````` example [foo][bar] @@ -7975,6 +8058,31 @@ Full references take precedence over shortcut references:
foo
```````````````````````````````` +```````````````````````````````` example +[foo][] + +[foo]: /url1 +. +
foo
+```````````````````````````````` + +Inline links also take precedence: + +```````````````````````````````` example +[foo]() + +[foo]: /url1 +. +
foo
+```````````````````````````````` + +```````````````````````````````` example +[foo](not a link) + +[foo]: /url1 +. +
foo(not a link)
+```````````````````````````````` In the following case `[bar][baz]` is parsed as a reference, `[foo]` as normal text: @@ -8853,7 +8961,7 @@ foo A regular line break (not in a code span or HTML tag) that is not preceded by two or more spaces or a backslash is parsed as a -softbreak. (A softbreak may be rendered in HTML either as a +[softbreak](@). (A softbreak may be rendered in HTML either as a [line ending] or as a space. The result will be the same in browsers. In the examples here, a [line ending] will be used.) @@ -8984,7 +9092,7 @@ blocks. But we cannot close unmatched blocks yet, because we may have a [lazy continuation line]. 2. Next, after consuming the continuation markers for existing -blocks, we look for new block starts (e.g. `>` for a block quote. +blocks, we look for new block starts (e.g. `>` for a block quote). If we encounter a new block start, we close any blocks unmatched in step 1 before creating the new block as a child of the last matched block. diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Arity1.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Arity1.scl index fa48e47c1..fc21692fc 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Arity1.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Arity1.scl @@ -1,9 +1,22 @@ - -data Foo a = Foo a - -f :: Foo a -> a -f = \Foo a -> a - -main = "Not to be executed" --- -5:6-5:11: Arity is 1 but 2 patterns have been given. \ No newline at end of file +data Foo a = Foo a + +f :: Foo a -> a +f = \Foo a -> a + +main = "Not to be executed" +-- +3:1-3:2: Possible problem: type declaration has 1 parameter types, but function definition has 2 parameters. +4:6-4:11: Arity is 1 but 2 patterns have been given. +-- +import "Prelude" + +f :: Integer -> Integer -> Integer +f x = do + print x + x + +main = "Not to be executed" +-- +3:1-3:2: Possible problem: type declaration has 2 parameter types, but function definition has 1 parameters. +5:5-5:12: No side-effects allowed here. +6:5-6:6: Expected Integer> got . \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR1.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR1.scl new file mode 100644 index 000000000..90ea90a06 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR1.scl @@ -0,0 +1,159 @@ +import "Prelude" + +slowSum :: [Integer] -> Integer +slowSum list = getRef answer + where + answer = ref 0 + + constraint El Integer + + ?x <- list => El ?x + -El ?x, -El ?y => El (?x + ?y) + El ?x => answer := ?x + +main = slowSum [1,6,9] +-- +16 +-- +import "Prelude" + +slowGcd :: [Integer] -> Integer +slowGcd list = getRef answer + where + answer = ref 0 + + constraint Gcd Integer + + ?x <- list => Gcd ?x + -Gcd 0 => True + -Gcd ?m, Gcd ?n, ?n <= ?m => Gcd (?m `mod` ?n) + Gcd ?answer => answer := ?answer + +main = slowGcd [12,20] +-- +4 +-- +import "Prelude" + +isReachable :: [(Integer,Integer)] -> Integer -> Integer -> Boolean +isReachable edges a b = getRef answer + where + answer = ref False + + constraint Edge Integer Integer + constraint Reachable Integer + + (?x,?y) <- edges => Edge ?x ?y + True => Reachable a + Reachable ?x, Edge ?x ?y => Reachable ?y + Reachable b => answer := True + +graph :: [(Integer, Integer)] +graph = [(0,1), (1,2), (2,3), (4,5)] + +main = (isReachable graph 0 3, isReachable graph 0 5) +-- +(true,false) +-- +import "StandardLibrary" + +primes1 limit = MList.freeze answer + where + answer = MList.create () + MList.add answer 2 + + constraint Prime Integer + constraint PrimeCandidate Integer + + True => PrimeCandidate 3 + -PrimeCandidate ?x, ?x > limit => True + -PrimeCandidate ?x, Prime ?y, ?x `mod` ?y = 0 => PrimeCandidate (?x + 2) + -PrimeCandidate ?x => MList.add answer ?x, Prime ?x, PrimeCandidate (?x + 2) + +main = primes1 30 +-- +[2, 3, 5, 7, 11, 13, 17, 19, 23, 29] +-- +import "StandardLibrary" + +powersOfTwo n = sort (MList.freeze answer) + where + answer = MList.create () + + constraint N Integer + + ?i <- [1..n] => N 1 + -N ?x, -N ?x => N (2*?x) + N ?x => MList.add answer ?x + +main = powersOfTwo 25 +-- +[1, 8, 16] +-- +import "StandardLibrary" + +main = MList.freeze answer + where + answer = MList.create () + add = MList.add answer + + constraint A + constraint B + constraint C + + A => add "A1" + B => add "B1" + C => add "C1" + A => add "A2" + B => add "B2" + C => add "C2" + + True => A + -A => B + -B => C +-- +[A1, A2, B1, B2, C1, C2] +-- +import "StandardLibrary" + +graph = [("1","2"), ("2","3"), ("3","4"), ("3","5"), ("1","4"), ("5","5")] + +main = sort (MList.freeze answer) + where + answer = MList.create () + + constraint Init + constraint Edge String String + constraint Degree String Integer + + True => Init + (?x, ?y) <- graph => Edge ?x ?y + + Init, Edge ?x ?y => Degree ?x 1, Degree ?y 1 + Init, -Degree ?x ?a, -Degree ?x ?b => Degree ?x (?a + ?b) + -Init => True + + -Degree ?x 0 => print "Remove node \(?x)" + -Degree ?x ?a, -Edge ?x ?x => Degree ?x (?a - 2), print "Remove loop (\(?x),\(?x))" + -Degree ?x ?a, -Edge ?x ?y, -Degree ?y ?b, (?a==1 || ?b==1) => Degree ?x (?a - 1), Degree ?y (?b - 1), print "Remove dangling edge (\(?x),\(?y))" + -Degree ?y 2, -Edge ?x ?y, -Edge ?y ?z => Edge ?x ?z, print "Simplify path (\(?x),\(?y),\(?z))" + + Edge ?x ?y => MList.add answer (?x, ?y) +-- +[(1,4), (1,4)] +-- +import "StandardLibrary" + +uniq :: [a] -> [a] +uniq l = MList.freeze answer + where + answer = MList.create () + + constraint El a + ?x <- l => El ?x + -El ?x, El ?x => True + El ?x => MList.add answer ?x + +main = sort $ uniq [1,1,2,2,3] +-- +[1, 2, 3] \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR2.scl new file mode 100644 index 000000000..35fb7240a --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR2.scl @@ -0,0 +1,49 @@ +import "Prelude" + +gSum :: Additive a => [a] -> a +gSum list = getRef answer + where + answer = ref zero + + constraint El a + + ?x <- list => El ?x + -El ?x, -El ?y => El (?x + ?y) + El ?x => answer := ?x + +main = (gSum [1,6,9], gSum [1.0,6.0,9.0]) +-- +(16,16.0) +-- +import "StandardLibrary" + +topologicalSort :: [(a,a)] -> [a] +topologicalSort dependencies = MList.freeze answer + where + answer = MList.create () + + (?x,?y) <- dependencies => Dep ?x ?y, InDegree ?x 0, InDegree ?y 1 + -InDegree ?x ?a, -InDegree ?x ?b => InDegree ?x (?a + ?b) + InDegree ?x 0 => AdjustInDegrees ?x, MList.add answer ?x + AdjustInDegrees ?x, Dep ?x ?y => InDegree ?y (-1) + +main = topologicalSort [(2,4),(3,7),(7,2),(1,3)] +-- +[1, 3, 7, 2, 4] +-- +import "StandardLibrary" + +topologicalSort :: Show a => [(a,a)] -> [a] +topologicalSort dependencies = MList.freeze answer + where + answer = MList.create () + + -Candidate ?x, Candidate ?x => True + (?x,?y) <- dependencies => Dep ?x ?y, Candidate ?x + -Candidate ?x, Dep _ ?x => True + Candidate ?x => MList.add answer ?x + Candidate ?x, -Dep ?x ?y => Candidate ?y + +main = topologicalSort [(2,4),(3,7),(7,2),(1,3)] +-- +[1, 3, 7, 2, 4] diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR3.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR3.scl new file mode 100644 index 000000000..0bba5413d --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/CHR3.scl @@ -0,0 +1,11 @@ +import "Prelude" + +main = () + where + A ?x => print ?x + A ?x, not A (?x+1) => A (?x-1) + True => A 0 +-- +() + + diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/ClosingBrace.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/ClosingBrace.scl new file mode 100644 index 000000000..ef7564482 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/ClosingBrace.scl @@ -0,0 +1,11 @@ +) +-- +1:1-1:2: No corresponding opening parenthesis for ')'. +-- +} +-- +1:1-1:2: No corresponding opening parenthesis for '}'. +-- +] +-- +1:1-1:2: No corresponding opening parenthesis for ']'. \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Equality.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Equality.scl index acf00e936..8a66e2eed 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Equality.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Equality.scl @@ -1,5 +1,7 @@ import "Prelude" +newEq = (==) + main = """ \(newEq () ()) \(newEq True True) diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl index affa2e66f..569335a0a 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/FoldMissingInitialValue.scl @@ -2,5 +2,4 @@ import "Prelude" f p l = (foldl (+) (map ((+)p) l)) + p -- -3:1-3:39: Couldn't simplify all effect subsumptions away. The current compiler cannot handle this situation. Try adding more type annotations. 3:25-3:31: Type [a b] -> a b is not a subtype of a. \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/IfWithoutElse.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/IfWithoutElse.scl new file mode 100644 index 000000000..6659033e2 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/IfWithoutElse.scl @@ -0,0 +1,11 @@ +import "Prelude" + +main = do + x = ref 3 + if 2 > 1 + then x := 4 + if 1 > 2 + then x := 8 + getRef x +-- +4 \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl index 8897d43dd..95d8b03da 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidLambda.scl @@ -1,4 +1,4 @@ main = \ /* no parameters */ -> 3 -- -2:30-2:32: Unexpected token '->' (ARROW). Expected one of ATTACHED_HASH, BEGIN_STRING, BLANK, CHAR, DO, ENFORCE, EQ, ESCAPED_SYMBOL, FLOAT, ID, IF, INTEGER, LAMBDA, LBRACKET, LET, LPAREN, MATCH, MDO, SELECT, SELECT_DISTINCT, SELECT_FIRST, TRANSFORMATION, WHEN. +2:30-2:32: Unexpected token '->' (ARROW). Expected one of ATTACHED_HASH, BEGIN_STRING, BLANK, CHAR, DO, ENFORCE, EQ, ESCAPED_SYMBOL, FLOAT, ID, IF, INTEGER, LAMBDA, LAMBDA_MATCH, LBRACKET, LET, LPAREN, MATCH, MDO, SELECT, SELECT_DISTINCT, SELECT_FIRST, TRANSFORMATION. \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/LambdaMatch.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/LambdaMatch.scl new file mode 100644 index 000000000..7e9103a6a --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/LambdaMatch.scl @@ -0,0 +1,10 @@ +import "Prelude" + +f :: Maybe String -> String +f = \match + Just a -> a + Nothing -> "" + +main = f Nothing + f (Just "foo") +-- +foo diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Macros2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Macros2.scl index d1379cd8e..582dc71d1 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Macros2.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Macros2.scl @@ -1,7 +1,5 @@ import "JavaBuiltin" as Java -(==) = Java.icmpeq - @macro (&<&) :: Integer -> Integer -> Integer a &<& b = if cmp == 0 then b else cmp diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Polynomials.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Polynomials.scl index 5e35b9424..f4cd21293 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Polynomials.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Polynomials.scl @@ -8,7 +8,7 @@ normalize l = go (length l) then go (i-1) else take i l -instance (Eq a, Additive a) => Additive (Poly a) where +instance (Additive a) => Additive (Poly a) where zero = Poly [] Poly a + Poly b = Poly ( @@ -23,7 +23,7 @@ instance (Eq a, Additive a) => Additive (Poly a) where la = length a lb = length b -instance (Eq a, Ring a) => Ring (Poly a) where +instance (Ring a) => Ring (Poly a) where one = Poly [one] neg (Poly l) = Poly (map neg l) a - b = a + (neg b) diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Primes.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Primes.scl index 830186ba7..854512752 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Primes.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Primes.scl @@ -2,12 +2,11 @@ import "JavaBuiltin" as Java infixl 7 (%) infixl 6 (+) -infix 4 (==), (<) +infix 4 (<) (+) = Java.iadd (%) = Java.irem (<) = Java.icmplt -(==) = Java.icmpeq isPrime p = isPrimeAux (2 :: Integer) p where diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Serialization4.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Serialization4.scl new file mode 100644 index 000000000..530f422c1 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Serialization4.scl @@ -0,0 +1,13 @@ +import "StandardLibrary" + +rt :: Serializable a => a -> a +rt v = deserialize (serialize v) + +main :: String +main = do + a = (1 :: Integer,"asd") + b = MMap.create () + MMap.put b "asdasd" (4 :: Long) + show (rt a, MMap.get (rt b) "asdasd") +-- +((1, "asd"), Just 4) \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Signals.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Signals.scl index 726a3f5be..afb4840d2 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Signals.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Signals.scl @@ -8,8 +8,6 @@ data Signal = | SigNeg Signal | SigMul [Signal] -deriving instance Eq Signal -deriving instance Hashable Signal deriving instance Show Signal instance Additive Signal where diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl index 9d219430b..e6ad8e114 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation2.scl @@ -1,6 +1,9 @@ -stringSum :: String -> Integer -stringSum "(\(a),\(b),\(c))" = a + b + c +import "Prelude" -main = stringSum "(1,2,3)" +main = match "abc123def" with + "abc\(x)fed" -> "X\(x)" + "cba\(x)def" -> "Y\(x)" + "abc\(x)def" -> "Z\(x)" + x -> "W\(x)" -- -6 \ No newline at end of file +Z123 \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation3.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation3.scl new file mode 100644 index 000000000..73be21499 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/StringInterpolation3.scl @@ -0,0 +1,12 @@ +import "Prelude" +// Test optimized special cases + +main = let + a = "123" + b = "456" + c = "\(a)" + d = "abc\(b)" + e = "\(d)def" + in "\(c)\(e)" +-- +123abc456def \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Transformation2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Transformation2.scl index dbb1609a9..45ad0658a 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Transformation2.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Transformation2.scl @@ -10,14 +10,14 @@ rule FibRecurrence where @where Fib (?n+2) (?a + 1) -/* + rule PrintIt where @when Fib ?n ?a @to Execute (print "\(?n) -> \(?a)") -*/ + main = transformation OneShotForward where Fib 0 1 Fib 1 1 diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl index 270d5751b..85637b16b 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnexpectedToken.scl @@ -1,4 +1,4 @@ a = = b = 4 -- -1:5-1:6: Unexpected token '=' (EQUALS). Expected one of ATTACHED_HASH, BEGIN_STRING, BLANK, CHAR, DO, ENFORCE, EQ, ESCAPED_SYMBOL, FLOAT, ID, IF, INTEGER, LAMBDA, LBRACKET, LET, LPAREN, MATCH, MDO, MINUS, SELECT, SELECT_DISTINCT, SELECT_FIRST, TRANSFORMATION, WHEN. \ No newline at end of file +1:5-1:6: Unexpected token '=' (EQUALS). Expected one of ATTACHED_HASH, BEGIN_STRING, BLANK, CHAR, DO, ENFORCE, EQ, ESCAPED_SYMBOL, FLOAT, ID, IF, INTEGER, LAMBDA, LAMBDA_MATCH, LBRACKET, LET, LPAREN, MATCH, MDO, MINUS, SELECT, SELECT_DISTINCT, SELECT_FIRST, TRANSFORMATION. \ No newline at end of file diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/ViewPatterns1.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/ViewPatterns1.scl new file mode 100644 index 000000000..092ce4863 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/ViewPatterns1.scl @@ -0,0 +1,10 @@ +import "Prelude" + +f :: String -> String +f (split "/" -> [a,b]) = "\(a)foo\(b)" +f (split "/" -> [a,b,c]) = "\(a)foo\(b)bar\(c)" +f str = str + +main = f "123" + f "abc/def" + f "123/456/789" +-- +123abcfoodef123foo456bar789 diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java new file mode 100644 index 000000000..afc9a44b2 --- /dev/null +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java @@ -0,0 +1,110 @@ +package org.simantics.scl.compiler.tests.unit; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import org.junit.Assert; +import org.junit.Test; +import org.simantics.scl.compiler.compilation.CompilationContext; +import org.simantics.scl.compiler.elaboration.chr.CHRRuleset; +import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint; +import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint.IndexInfo; +import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification; +import org.simantics.scl.compiler.errors.Locations; +import org.simantics.scl.compiler.internal.codegen.chr.CHRCodeGenerator; +import org.simantics.scl.compiler.internal.codegen.types.JavaTypeTranslator; +import org.simantics.scl.compiler.internal.codegen.utils.JavaNamingPolicy; +import org.simantics.scl.compiler.internal.codegen.utils.ModuleBuilder; +import org.simantics.scl.compiler.module.repository.ModuleRepository; +import org.simantics.scl.compiler.runtime.MutableClassLoader; +import org.simantics.scl.compiler.runtime.RuntimeEnvironment; +import org.simantics.scl.compiler.tests.InitialRepository; +import org.simantics.scl.compiler.types.Type; +import org.simantics.scl.compiler.types.Types; + +public class TestCHRCodeGenerator { + @Test + public void testCodeGenerator() throws Throwable { + try { + ModuleRepository repository = InitialRepository.getInitialRepository(); + RuntimeEnvironment environment = repository.createRuntimeEnvironment(EnvironmentSpecification.of("StandardLibrary", "", "Builtin", ""), getClass().getClassLoader()); + JavaNamingPolicy policy = new JavaNamingPolicy("Expression"); + JavaTypeTranslator jtt = new JavaTypeTranslator(environment.getEnvironment()); + CompilationContext compilationContext = new CompilationContext(); + compilationContext.environment = environment.getEnvironment(); + compilationContext.javaTypeTranslator = jtt; + compilationContext.namingPolicy = policy; + ModuleBuilder moduleBuilder = new ModuleBuilder(policy, jtt); + + CHRRuleset ruleset = new CHRRuleset(); + CHRConstraint exampleFact = new CHRConstraint(Locations.NO_LOCATION, "ExampleFact", new Type[] { Types.INTEGER, Types.INTEGER }); + ruleset.constraints.add(exampleFact); + + System.out.println("=============================================================================================="); + ruleset.initializeCodeGeneration(compilationContext); + exampleFact.indices.put(0, new IndexInfo(0, "ff", null, null)); + exampleFact.indices.put(1, new IndexInfo(1, "bf", null, null)); + exampleFact.indices.put(2, new IndexInfo(2, "fb", null, null)); + exampleFact.indices.put(3, new IndexInfo(3, "bb", null, null)); + exampleFact.setMayBeRemoved(); + + CHRCodeGenerator.generateStore(moduleBuilder, ruleset); + + MutableClassLoader classLoader = environment.getMutableClassLoader(); + classLoader.addClasses(moduleBuilder.getClasses()); + + String storeClassName = ruleset.storeClassName.replace('/', '.'); + Class storeClass = classLoader.loadClass(storeClassName); + Class factClass = classLoader.loadClass(storeClassName+"$ExampleFact"); + Constructor factConstructor = factClass.getConstructor(int.class, int.class, int.class); + Method addMethod = factClass.getMethod("add", storeClass); + Method removeMethod = factClass.getMethod("remove", storeClass); + Method getMethod = storeClass.getMethod("ExampleFact$bf", int.class); + Field nextField = factClass.getField("bfNext"); + + Object store = storeClass.newInstance(); + Object fact1 = factConstructor.newInstance(0, 1,2); + Object fact2 = factConstructor.newInstance(0, 1,3); + Object fact3 = factConstructor.newInstance(0, 2,4); + Object fact4 = factConstructor.newInstance(0, 1,4); + addMethod.invoke(fact1, store); + addMethod.invoke(fact4, store); + addMethod.invoke(fact2, store); + addMethod.invoke(fact3, store); + removeMethod.invoke(fact4, store); + { + Object f1 = getMethod.invoke(store, 1); + Assert.assertEquals(fact2, f1); + Object f2 = nextField.get(f1); + Assert.assertEquals(fact1, f2); + Object f3 = nextField.get(f2); + Assert.assertEquals(null, f3); + } + removeMethod.invoke(fact2, store); + { + Object f1 = getMethod.invoke(store, 1); + Assert.assertEquals(fact1, f1); + Object f2 = nextField.get(f1); + Assert.assertEquals(null, f2); + } + addMethod.invoke(fact2, store); + removeMethod.invoke(fact1, store); + { + Object f1 = getMethod.invoke(store, 1); + Assert.assertEquals(fact2, f1); + Object f2 = nextField.get(f1); + Assert.assertEquals(null, f2); + } + removeMethod.invoke(fact2, store); + { + Object f1 = getMethod.invoke(store, 1); + Assert.assertEquals(null, f1); + } + } catch(Throwable e) { + e.printStackTrace(); + throw e; + } + } + +} diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java index fa3bd9f65..3f9c9e4e9 100644 --- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java +++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestNamespaceFilter.java @@ -2,6 +2,7 @@ package org.simantics.scl.compiler.tests.unit; import java.util.Collection; +import org.junit.Assert; import org.junit.Test; import org.simantics.scl.compiler.environment.filter.AcceptAllNamespaceFilter; import org.simantics.scl.compiler.environment.filter.NamespaceFilter; @@ -10,7 +11,6 @@ import org.simantics.scl.compiler.environment.filter.NegativeNamespaceFilter; import org.simantics.scl.compiler.environment.filter.PositiveNamespaceFilter; import gnu.trove.set.hash.THashSet; -import junit.framework.Assert; public class TestNamespaceFilter {

Foo

foo

foo

foo

foo

foo

foo

foo bar *baz*

foo

foo

foo

foo

foo

bar

foo

foo

foo

foo ### b

foo#

foo ###

foo ###

foo #

foo

baz

Foo bar

Foo bar

Foo bar -baz

Foo

Foo

Foo

Foo

Foo

Foo

Foo

Foo\

`Foo

<a title="a lot

Foo -Bar

Foo

Bar

> foo

bar

Heading

Heading

foo

baz

Foo

aaa

Foo

Foo

Foo

Foo

Foo

Bar

foo\

foo

Definition of Done for Simantics Platform Releases

Simantics Platform Release Process

Released Plug-in Components and Products

Release Schedule

Simantics Platform Release - Step by Step

Create release branch from selected commit

Prepare release branch for use

Prepare .target files

Initialize release branch distribution web site

Review documentation

Review tutorials

Tag release/* branches

Backup documentation wiki databases

Compile change log entry

Disseminate information about the release

TODO

Foo

foo bar baz