+""" + var exp = """ +

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_span_code1 do + var test = "Use the `printf()` function." + var exp = "

Use the printf() function.

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_span_code2 do + var test = "``There is a literal backtick (`) here.``" + var exp = "

There is a literal backtick (`) here.

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_span_code3 do + var test = """ +A single backtick in a code span: `` ` `` + +A backtick-delimited string in a code span: `` `foo` `` +""" + var exp = """ +

A single backtick in a code span: `

A backtick-delimited string in a code span: `foo`

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_span_code4 do + var test = "Please don't use any `` tags." + var exp = "

Please don't use any <blink> tags.

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_span_code5 do + var test = "`—` is the decimal-encoded equivalent of `—`." + var exp = "

— is the decimal-encoded equivalent of —.

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_escape1 do + var test = "\\*this text is surrounded by literal asterisks\\*" + var exp = "

*this text is surrounded by literal asterisks*

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_escape2 do + var test = "1986\\. What a great season." + var exp = "

1986. What a great season.

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_escape3 do + var test = "Ben & Lux" + var exp = "

Ben & Lux

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link1 do + var test = """ +This is [an example](http://example.com/ "Title") inline link. + +[This link](http://example.net/) has no title attribute. +""" + var exp = """

This is an example inline link.

This link has no title attribute.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link2 do + var test = "See my [About](/about/) page for details." + var exp = "

See my About page for details.

\n" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link3 do + var test = """ +This is [an example][id] reference-style link. + +This is [an example] [id] reference-style link. + +Some lorem ipsum + +[id]: http://example.com/ "Optional Title Here" + +Some other lipsum +""" + var exp = """ +

This is an example reference-style link.

Some lorem ipsum

Some other lipsum

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link4 do + var test = """ +This is multiple examples: [foo][1], [bar][2], [baz][3]. + +[1]: http://example.com/ "Optional Title Here" +[2]: http://example.com/ 'Optional Title Here' +[3]: http://example.com/ (Optional Title Here) +""" + var exp = """ +

This is multiple examples: foo, bar, baz.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link5 do + var test = """ +This is multiple examples: [foo][a], [bar][A], [a]. + +[a]: http://example.com/ "Optional Title Here" +""" + var exp = """

This is multiple examples: foo, bar, a.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link6 do + var test = """ +I get 10 times more traffic from [Google][] than from [Yahoo][] or [MSN][]. + +[Google]: http://google.com/ "Google" +[Yahoo]: http://search.yahoo.com/ "Yahoo Search" +[MSN]: http://search.msn.com/ "MSN Search" +""" + var exp = """

I get 10 times more traffic from Google than from Yahoo or MSN.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link7 do + var test = """ +Visit [Daring Fireball][] for more information. + +[Daring Fireball]: http://daringfireball.net/ +""" + var exp = """

Visit Daring Fireball for more information.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_link8 do + var test = """ +This one has a [line +break]. + +This one has a [line +break] with a line-ending space. + +[line break]: /foo +""" + var exp = """ +

This one has a line +break.

This one has a line +break with a line-ending space.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + # FIXME unignore test once escape strings fixed + # fun test_process_link9 do + # var test = """ + # Foo [bar][]. + # + # Foo [bar](/url/ "Title with \"quotes\" inside"). + # + # + # [bar]: /url/ "Title with \"quotes\" inside" + # """ + # var exp = """ + #

Foo bar.

+ #

Foo bar.

+ # """ + # var res = test.md_to_html.write_to_string + # assert res == exp + # end + + fun test_process_img1 do + var test = """ +![Alt text](/path/to/img.jpg) + +![Alt text](/path/to/img.jpg "Optional title") +""" + var exp = """

Alt text

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_process_img2 do + var test = """ +![Alt text][id] + +[id]: url/to/image "Optional title attribute" +""" + var exp = """

Alt text

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_encoding do + var test = """ +AT&T has an ampersand in their name. + +AT&T is another way to write it. + +This & that. + +4 < 5. + +6 > 5. + +Here's a [link] [1] with an ampersand in the URL. + +Here's a link with an amersand in the link text: [AT&T] [2]. + +Here's an inline [link](/script?foo=1&bar=2). + +Here's an inline [link](). + + +[1]: http://example.com/?foo=1&bar=2 +[2]: http://att.com/ "AT&T" +""" + + var exp = """ +

AT&T has an ampersand in their name.

AT&T is another way to write it.

This & that.

4 < 5.

6 > 5.

Here's a link with an ampersand in the URL.

Here's a link with an amersand in the link text: AT&T.

Here's an inline link.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + + end + + fun test_daring_autolinks do + var test = """ +Link: . + +With an ampersand: + +* In a list? +* +* It should. + +> Blockquoted: + +Auto-links should not occur here: `` + + or here: +""" + + var exp = """ +

Link: http://example.com/.

With an ampersand: http://example.com/?foo=1&bar=2

In a list?
http://example.com/
It should.

+
Blockquoted: http://example.com/
+

Auto-links should not occur here: <http://example.com/>

or here: <http://example.com/>
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_escape do + var test = """ +These should all get escaped: + +Backslash: \\ + +Backtick: \` + +Asterisk: \* + +Underscore: \_ + +Left brace: \{ + +Right brace: \} + +Left bracket: \[ + +Right bracket: \] + +Left paren: $ + +Right paren: $ + +Greater-than: \> + +Hash: \# + +Period: \. + +Bang: \! + +Plus: \+ + +Minus: \- + + +These should not, because they occur within a code block: + + Backslash: \\ + + Backtick: \` + + Asterisk: \* + + Underscore: \_ + + Left brace: \{ + + Right brace: \} + + Left bracket: \[ + + Right bracket: \] + + Left paren: $ + + Right paren: $ + + Greater-than: \> + + Hash: \# + + Period: \. + + Bang: \! + + Plus: \+ + + Minus: \- + +Nor should these, which occur in code spans: + +Backslash: `\\` + +Backtick: `` \` `` + +Asterisk: `\*` + +Underscore: `\_` + +Left brace: `\{` + +Right brace: `\}` + +Left bracket: `\[` + +Right bracket: `\]` + +Left paren: `$` + +Right paren: `$` + +Greater-than: `\>` + +Hash: `\#` + +Period: `\.` + +Bang: `\!` + +Plus: `\+` + +Minus: `\-` + +These should get escaped, even though they're matching pairs for +other Markdown constructs: + +\\\*asterisks\\\* + +\\\_underscores\\\_ + +\\\`backticks\\\` + +This is a code span with a literal backslash-backtick sequence: `` \` `` + +This is a tag with unescaped backticks bar. + +This is a tag with backslashes bar. +""" + var exp = """ +

These should all get escaped:

Backslash: \\

Backtick: \`

Asterisk: \*

Underscore: \_

Left brace: \{

Right brace: \}

Left bracket: \[

Right bracket: \]

Left paren: \(

Right paren: \)

Greater-than: \>

Hash: \#

Period: \.

Bang: \!

Plus: \+

Minus: \-

These should not, because they occur within a code block:

Backslash: \\
+
+Backtick: \`
+
+Asterisk: \*
+
+Underscore: \_
+
+Left brace: \{
+
+Right brace: \}
+
+Left bracket: \[
+
+Right bracket: \]
+
+Left paren: \(
+
+Right paren: \)
+
+Greater-than: \>
+
+Hash: \#
+
+Period: \.
+
+Bang: \!
+
+Plus: \+
+
+Minus: \-
+

Nor should these, which occur in code spans:

Backslash: \\

Backtick: \`

Asterisk: \*

Underscore: \_

Left brace: \{

Right brace: \}

Left bracket: \[

Right bracket: \]

Left paren: \(

Right paren: \)

Greater-than: \>

Hash: \#

Period: \.

Bang: \!

Plus: \+

Minus: \-

These should get escaped, even though they're matching pairs for +other Markdown constructs:

*asterisks*

_underscores_

`backticks`

This is a code span with a literal backslash-backtick sequence: \`

This is a tag with unescaped backticks bar.

This is a tag with backslashes bar.

+""" + + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_blockquotes do + var test = """ +> Example: +> +> sub status { +> print "working"; +> } +> +> Or: +> +> sub status { +> return "working"; +> } +""" + + var exp = """ +

Example:

sub status {
+    print "working";
+}
+

Or:

sub status {
+    return "working";
+}
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_code_blocks do + var test = """ + code block on the first line + +Regular text. + + code block indented by spaces + +Regular text. + + the lines in this block + all contain trailing spaces + +Regular Text. + + code block on the last line +""" + + var exp = """ +

code block on the first line
+

Regular text.

code block indented by spaces
+

Regular text.

the lines in this block
+all contain trailing spaces
+

Regular Text.

code block on the last line
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_code_spans do + var test = """ +`` + +Fix for backticks within HTML tag: like this + +Here's how you put `` `backticks` `` in a code span. +""" + + var exp = """ +

<test a=" content of attribute ">

Fix for backticks within HTML tag: like this

Here's how you put `backticks` in a code span.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_pars do + var test = """ +In Markdown 1.0.0 and earlier. Version +8. This line turns into a list item. +Because a hard-wrapped line in the +middle of a paragraph looked like a +list item. + +Here's one with a bullet. +* criminey. +""" + + var exp = """ +

In Markdown 1.0.0 and earlier. Version +8. This line turns into a list item. +Because a hard-wrapped line in the +middle of a paragraph looked like a +list item.

Here's one with a bullet. +* criminey.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_rules do + var test = """ +Dashes: + +--- + + --- + + --- + + --- + + --- + +- - - + + - - - + + - - - + + - - - + + - - - + + +Asterisks: + +*** + + *** + + *** + + *** + + *** + +* * * + + * * * + + * * * + + * * * + + * * * + + +Underscores: + +___ + + ___ + + ___ + + ___ + + ___ + +_ _ _ + + _ _ _ + + _ _ _ + + _ _ _ + + _ _ _ +""" + + var exp = """ +

Dashes:

---
+

- - -
+

Asterisks:

***
+

* * *
+

Underscores:

___
+

_ _ _
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_images do + var test = """ +![Alt text](/path/to/img.jpg) + +![Alt text](/path/to/img.jpg "Optional title") + +Inline within a paragraph: [alt text](/url/). + +![alt text](/url/ "title preceded by two spaces") + +![alt text](/url/ "title has spaces afterward" ) + +![alt text]() + +![alt text]( "with a title"). + +![Empty]() + +![this is a stupid URL](http://example.com/(parens).jpg) + + +![alt text][foo] + + [foo]: /url/ + +![alt text][bar] + + [bar]: /url/ "Title here" +""" + + var exp = """ +

Alt text

Inline within a paragraph: alt text.

alt text

alt text .

Empty

this is a stupid URL

alt text

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_inline_html1 do + var test = """ +Here's a simple block: + +

+ foo +

+ +This should be a code block, though: + +

+ foo +

+ +As should this: + +

foo

+ +Now, nested: + +

+ foo +

+ +This should just be an HTML comment: + + + +Multiline: + + + +Code block: + + + +Just plain comment, with trailing spaces on the line: + + + +Code: + +

+ +Hr's: + +

+ +

+""" + + var exp = """ +

Here's a simple block:

+ foo +

This should be a code block, though:

<div>
+    foo
+</div>
+

As should this:

<div>foo</div>
+

Now, nested:

+ foo +

This should just be an HTML comment:

+ +

Multiline:

+ +

Code block:

<!-- Comment -->
+

Just plain comment, with trailing spaces on the line:

+ +

Code:

<hr />
+

Hr's:

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_inline_html2 do + var test = """ +Simple block on one line: + +

foo

+ +And nested without indentation: + +

+foo +

bar

+ +And with attributes: + +

+ +This was broken in 1.0.2b7: + +

+foo +

+""" + + var exp = """ +

Simple block on one line:

foo

And nested without indentation:

+foo +

bar

And with attributes:

This was broken in 1.0.2b7:

+foo +

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_inline_html3 do + var test = """ +Paragraph one. + + + + + +Paragraph two. + + + +The end. +""" + + var exp = """ +

Paragraph one.

+ + +

Paragraph two.

+ +

The end.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_links1 do + var test = """ +Just a [URL](/url/). + +[URL and title](/url/ "title"). + +[URL and title](/url/ "title preceded by two spaces"). + +[URL and title](/url/ "title preceded by a tab"). + +[URL and title](/url/ "title has spaces afterward" ). + +[URL wrapped in angle brackets](). + +[URL w/ angle brackets + title]( "Here's the title"). + +[Empty](). + +[With parens in the URL](http://en.wikipedia.org/wiki/WIMP_(computing)) + +(With outer parens and [parens in url](/foo(bar))) + + +[With parens in the URL](/foo(bar) "and a title") + +(With outer parens and [parens in url](/foo(bar) "and a title")) +""" + + var exp = """ +

Just a URL.

URL and title.

URL wrapped in angle brackets.

URL w/ angle brackets + title.

Empty.

With parens in the URL

(With outer parens and parens in url)

With parens in the URL

(With outer parens and parens in url)

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_links2 do + var test = """ +Foo [bar] [1]. + +Foo [bar][1]. + +Foo [bar] +[1]. + +[1]: /url/ "Title" + + +With [embedded [brackets]] [b]. + + +Indented [once][]. + +Indented [twice][]. + +Indented [thrice][]. + +Indented [four][] times. + + [once]: /url + + [twice]: /url + + [thrice]: /url + + [four]: /url + + +[b]: /url/ + +* * * + +[this] [this] should work + +So should [this][this]. + +And [this] []. + +And [this][]. + +And [this]. + +But not [that] []. + +Nor [that][]. + +Nor [that]. + +[Something in brackets like [this][] should work] + +[Same with [this].] + +In this case, [this](/somethingelse/) points to something else. + +Backslashing should suppress \\\[this] and [this\\\]. + +[this]: foo + + +* * * + +Here's one where the [link +breaks] across lines. + +Here's another where the [link +breaks] across lines, but with a line-ending space. + + +[link breaks]: /url/ +""" + + var exp = """ +

Foo bar.

With embedded [brackets].

Indented once.

Indented twice.

Indented thrice.

Indented [four][] times.

[four]: /url
+

this should work

So should this.

And this.

But not [that] [].

Nor [that][].

Nor [that].

[Something in brackets like this should work]

[Same with this.]

In this case, this points to something else.

Backslashing should suppress [this] and [this].

Here's one where the link +breaks across lines.

Here's another where the link +breaks across lines, but with a line-ending space.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_links3 do + var test = """ +This is the [simple case]. + +[simple case]: /simple + + + +This one has a [line +break]. + +This one has a [line +break] with a line-ending space. + +[line break]: /foo + + +[this] [that] and the [other] + +[this]: /this +[that]: /that +[other]: /other +""" + + var exp = """ +

This is the simple case.

This one has a line +break.

This one has a line +break with a line-ending space.

this and the other

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_nested do + var test = """ +> foo +> +> > bar +> +> foo +""" + + var exp = """ +

+
foo
+
+
bar
+
+
foo
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_list do + var test = """ +## Unordered + +Asterisks tight: + +* asterisk 1 +* asterisk 2 +* asterisk 3 + + +Asterisks loose: + +* asterisk 1 + +* asterisk 2 + +* asterisk 3 + +* * * + +Pluses tight: + ++ Plus 1 ++ Plus 2 ++ Plus 3 + + +Pluses loose: + ++ Plus 1 + ++ Plus 2 + ++ Plus 3 + +* * * + + +Minuses tight: + +- Minus 1 +- Minus 2 +- Minus 3 + + +Minuses loose: + +- Minus 1 + +- Minus 2 + +- Minus 3 + + +## Ordered + +Tight: + +1. First +2. Second +3. Third + +and: + +1. One +2. Two +3. Three + + +Loose using tabs: + +1. First + +2. Second + +3. Third + +and using spaces: + +1. One + +2. Two + +3. Three + +Multiple paragraphs: + +1. Item 1, graf one. + + Item 2. graf two. The quick brown fox jumped over the lazy dog's + back. + +2. Item 2. + +3. Item 3. + + + +## Nested + +* Tab + * Tab + * Tab + +Here's another: + +1. First +2. Second: + * Fee + * Fie + * Foe +3. Third + +Same thing but with paragraphs: + +1. First + +2. Second: + * Fee + * Fie + * Foe + +3. Third +""" + + var exp = """ +

Unordered

Asterisks tight:

asterisk 1
asterisk 2
asterisk 3

Asterisks loose:

asterisk 1
+
asterisk 2
+
asterisk 3
+

Pluses tight:

Plus 1
Plus 2
Plus 3

Pluses loose:

Plus 1
+
Plus 2
+
Plus 3
+

Minuses tight:

Minus 1
Minus 2
Minus 3

Minuses loose:

Minus 1
+
Minus 2
+
Minus 3
+

Ordered

Tight:

First
Second
Third

and:

One
Two
Three

Loose using tabs:

First
+
Second
+
Third
+

and using spaces:

One
+
Two
+
Three
+

Multiple paragraphs:

Item 1, graf one.
+
Item 2. graf two. The quick brown fox jumped over the lazy dog's +back.
+
Item 2.
+
Item 3.
+

Nested

Tab
- Tab
  - Tab
  +
+

Here's another:

First
Second:
- Fee
- Fie
- Foe
+
Third

Same thing but with paragraphs:

First
+
Second:
+
- Fee
- Fie
- Foe
+
Third
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_strong_em do + var test = """ +***This is strong and em.*** + +So is ***this*** word. + +___This is strong and em.___ + +So is ___this___ word. +""" + + var exp = """ +

This is strong and em.

So is this word.

This is strong and em.

So is this word.

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_tabs do + var test = """ ++ this is a list item + indented with tabs + ++ this is a list item + indented with spaces + +Code: + + this code block is indented by one tab + +And: + + this code block is indented by two tabs + +And: + + + this is an example list item + indented with tabs + + + this is an example list item + indented with spaces +""" + + var exp = """ +

this is a list item +indented with tabs
+
this is a list item +indented with spaces
+

Code:

this code block is indented by one tab
+

And:

    this code block is indented by two tabs
+

And:

+   this is an example list item
+    indented with tabs
+
++   this is an example list item
+    indented with spaces
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + fun test_daring_tidyness do + var test = """ +> A list within a blockquote: +> +> * asterisk 1 +> * asterisk 2 +> * asterisk 3 +""" + + var exp = """ +

+
A list within a blockquote:
+
+
asterisk 1
+
asterisk 2
+
asterisk 3
+
+

+""" + var res = test.md_to_html.write_to_string + assert res == exp + end + + +end + +class TestBlock + super TestSuite + + fun test_has_blocks do + var subject = new MDBlock + assert not subject.has_blocks + subject.first_block = new MDBlock + assert subject.has_blocks + end + + fun test_count_blocks do + var subject = new MDBlock + assert subject.count_blocks == 0 + subject.first_block = new MDBlock + assert subject.count_blocks == 1 + subject.first_block.next = new MDBlock + assert subject.count_blocks == 2 + end + + fun test_has_lines do + var subject = new MDBlock + assert not subject.has_lines + subject.first_line = new MDLine("") + assert subject.has_lines + end + + fun test_count_lines do + var subject = new MDBlock + assert subject.count_lines == 0 + subject.first_line = new MDLine("") + assert subject.count_lines == 1 + subject.first_line.next = new MDLine("") + assert subject.count_lines == 2 + end + + fun test_split do + var line1 = new MDLine("line1") + var line2 = new MDLine("line2") + var line3 = new MDLine("line3") + var subject = new MDBlock + subject.add_line line1 + subject.add_line line2 + subject.add_line line3 + var block = subject.split(line2) + assert subject.count_blocks == 1 + assert subject.count_lines == 1 + assert subject.first_line == line3 + assert block.count_blocks == 0 + assert block.count_lines == 2 + assert block.first_line == line1 + assert block.last_line == line2 + end + + fun test_add_line do + var subject = new MDBlock + assert subject.count_lines == 0 + subject.add_line new MDLine("") + assert subject.count_lines == 1 + subject.add_line new MDLine("") + assert subject.count_lines == 2 + end + + fun test_remove_line do + var line1 = new MDLine("line1") + var line2 = new MDLine("line2") + var line3 = new MDLine("line3") + var subject = new MDBlock + subject.add_line line1 + subject.add_line line2 + subject.add_line line3 + subject.remove_line(line2) + assert subject.count_lines == 2 + subject.remove_line(line1) + assert subject.count_lines == 1 + assert subject.first_line == line3 + assert subject.last_line == line3 + end + + fun test_transform_headline1 do + var subject = new MDBlock + var kind = new BlockHeadline(subject) + subject.add_line new MDLine(" # Title 1 ") + kind.transform_headline(subject) + assert kind.depth == 1 + assert subject.first_line.value == "Title 1" + end + + fun test_transform_headline2 do + var subject = new MDBlock + var kind = new BlockHeadline(subject) + subject.add_line new MDLine(" #####Title 5 ") + kind.transform_headline(subject) + assert kind.depth == 5 + assert subject.first_line.value == "Title 5" + end + + fun test_remove_quote_prefix do + var subject = new MDBlock + var kind = new BlockQuote(subject) + subject.add_line new MDLine(" > line 1") + subject.add_line new MDLine(" > line 2") + subject.add_line new MDLine(" > line 3") + kind.remove_block_quote_prefix(subject) + assert subject.first_line.value == "line 1" + assert subject.first_line.next.value == "line 2" + assert subject.first_line.next.next.value == "line 3" + end + + fun test_remove_leading_empty_lines_1 do + var block = new MDBlock + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine(" text") + block.add_line new MDLine("") + assert block.remove_leading_empty_lines + assert block.first_line.value == " text" + end + + fun test_remove_leading_empty_lines_2 do + var block = new MDBlock + block.add_line new MDLine(" text") + block.remove_leading_empty_lines + assert block.first_line.value == " text" + end + + fun test_remove_trailing_empty_lines_1 do + var block = new MDBlock + block.add_line new MDLine("") + block.add_line new MDLine("text") + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine("") + assert block.remove_trailing_empty_lines + assert block.last_line.value == "text" + end + + fun test_remove_trailing_empty_lines_2 do + var block = new MDBlock + block.add_line new MDLine("text ") + assert not block.remove_trailing_empty_lines + assert block.last_line.value == "text " + end + + fun test_remove_surrounding_empty_lines do + var block = new MDBlock + block.add_line new MDLine("") + block.add_line new MDLine("text") + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine("") + block.add_line new MDLine("") + assert block.remove_surrounding_empty_lines + assert block.first_line.value == "text" + assert block.last_line.value == "text" + end +end + +class TestLine + super TestSuite + + var subject: MDLine + + init do end + + fun test_is_empty do + subject = new MDLine("") + assert subject.is_empty + subject = new MDLine(" ") + assert subject.is_empty + subject = new MDLine("test") + assert not subject.is_empty + subject = new MDLine(" test") + assert not subject.is_empty + end + + fun test_leading do + subject = new MDLine("") + assert subject.leading == 0 + subject = new MDLine(" ") + assert subject.leading == 4 + subject = new MDLine("test") + assert subject.leading == 0 + subject = new MDLine(" test") + assert subject.leading == 4 + end + + fun test_trailing do + subject = new MDLine("") + assert subject.trailing == 0 + subject = new MDLine(" ") + assert subject.trailing == 0 + subject = new MDLine("test ") + assert subject.trailing == 3 + subject = new MDLine(" test ") + assert subject.trailing == 1 + end + + fun test_line_type do + var v = new MarkdownProcessor + subject = new MDLine("") + assert subject.kind(v) isa LineEmpty + subject = new MDLine(" ") + assert subject.kind(v) isa LineEmpty + subject = new MDLine("text ") + assert subject.kind(v) isa LineOther + subject = new MDLine(" # Title") + assert subject.kind(v) isa LineHeadline + subject = new MDLine(" ### Title") + assert subject.kind(v) isa LineHeadline + subject = new MDLine(" code") + assert subject.kind(v) isa LineCode + subject = new MDLine(" ~~~") + assert subject.kind(v) isa LineFence + subject = new MDLine(" ```") + assert subject.kind(v) isa LineFence + subject = new MDLine(" Title ") + subject.next = new MDLine("== ") + assert subject.kind(v) isa LineHeadline1 + subject = new MDLine(" Title ") + subject.next = new MDLine("-- ") + assert subject.kind(v) isa LineHeadline2 + subject = new MDLine(" * * * ") + assert subject.kind(v) isa LineHR + subject = new MDLine(" *** ") + assert subject.kind(v) isa LineHR + subject = new MDLine("- -- ") + assert subject.kind(v) isa LineHR + subject = new MDLine("--------- ") + assert subject.kind(v) isa LineHR + subject = new MDLine(" >") + assert subject.kind(v) isa LineBlockquote + subject = new MDLine("

") + assert subject.kind(v) isa LineXML + subject = new MDLine("

") + assert subject.kind(v) isa LineOther + subject = new MDLine(" * foo") + assert subject.kind(v) isa LineUList + subject = new MDLine("- foo") + assert subject.kind(v) isa LineUList + subject = new MDLine("+ foo") + assert subject.kind(v) isa LineUList + subject = new MDLine("1. foo") + assert subject.kind(v) isa LineOList + subject = new MDLine(" 11111. foo") + assert subject.kind(v) isa LineOList + end + + fun test_count_chars do + subject = new MDLine("") + assert subject.count_chars('*') == 0 + subject = new MDLine("* ") + assert subject.count_chars('*') == 1 + subject = new MDLine(" * text") + assert subject.count_chars('*') == 0 + subject = new MDLine(" * * *") + assert subject.count_chars('*') == 3 + subject = new MDLine("text ** ") + assert subject.count_chars('*') == 0 + end + + fun test_count_chars_start do + subject = new MDLine("") + assert subject.count_chars_start('*') == 0 + subject = new MDLine("* ") + assert subject.count_chars_start('*') == 1 + subject = new MDLine(" * text") + assert subject.count_chars_start('*') == 1 + subject = new MDLine(" * * * text") + assert subject.count_chars_start('*') == 3 + subject = new MDLine("text ** ") + assert subject.count_chars_start('*') == 0 + end +end diff --git a/lib/mnit/mnit_app.nit b/lib/mnit/mnit_app.nit index 4c003a6..9987b8c 100644 --- a/lib/mnit/mnit_app.nit +++ b/lib/mnit/mnit_app.nit @@ -30,10 +30,10 @@ redef class App # Display to use by apps # Is null if the display is not available or not yet ready - var display: nullable D protected writable = null + var display: nullable D = null is protected writable # Received quit order - var quit: Bool writable = false + var quit: Bool = false is writable # App is visible? (vs minimized or in background) fun visible: Bool is abstract diff --git a/lib/mnit/mnit_fps.nit b/lib/mnit/mnit_fps.nit index cd30e83..2b2abf1 100644 --- a/lib/mnit/mnit_fps.nit +++ b/lib/mnit/mnit_fps.nit @@ -24,7 +24,7 @@ redef class App # Zero (or a negative value) means no limit. # # Applications can modify this value even during the main-loop. - var maximum_fps writable = 60 + var maximum_fps = 60 is writable # Current frame-rate # Updated each 5 seconds. diff --git a/lib/mnit/mnit_null.nit b/lib/mnit/mnit_null.nit index c966769..91bc359 100644 --- a/lib/mnit/mnit_null.nit +++ b/lib/mnit/mnit_null.nit @@ -77,7 +77,7 @@ class NullImage super Image var path: String redef fun to_s do return path - redef var scale redef writable = 1.0 + redef var scale = 1.0 is redef writable redef var width = 32 redef var height = 32 end diff --git a/lib/mnit/tileset.nit b/lib/mnit/tileset.nit index 7b473f3..b0eae74 100644 --- a/lib/mnit/tileset.nit +++ b/lib/mnit/tileset.nit @@ -80,11 +80,11 @@ class TileSetFont # Additional space to insert horizontally between characters # A negave value will display tile overlaped - var hspace: Int writable = 0 + var hspace: Int = 0 is writable # Additional space to insert vertically between characters # A negave value will display tile overlaped - var vspace: Int writable = 0 + var vspace: Int = 0 is writable # The glyph (tile) associated to the caracter `c` according to `chars` # Returns null if `c` is not in `chars` diff --git a/lib/neo4j/curl_json.nit b/lib/neo4j/curl_json.nit index 77d3650..f1a1da8 100644 --- a/lib/neo4j/curl_json.nit +++ b/lib/neo4j/curl_json.nit @@ -35,14 +35,14 @@ abstract class JsonCurlRequest end # OAuth token - var auth: nullable String writable + var auth: nullable String is writable # User agent (is used by github to contact devs in case of problems) # Eg. "Awesome-Octocat-App" - var user_agent: nullable String writable + var user_agent: nullable String is writable # HTTP headers to send - var headers: nullable HeaderMap writable = null + var headers: nullable HeaderMap = null is writable # init HTTP headers for Neo4j REST API @@ -125,7 +125,7 @@ end class JsonPOST super JsonCurlRequest - var data: nullable Jsonable writable = null + var data: nullable Jsonable = null is writable redef fun init_headers do super @@ -160,7 +160,7 @@ end class JsonPUT super JsonCurlRequest - var data: nullable Jsonable writable = null + var data: nullable Jsonable = null is writable redef fun init_headers do super diff --git a/lib/nitcc_runtime.nit b/lib/nitcc_runtime.nit index c71ea6b..74dcd43 100644 --- a/lib/nitcc_runtime.nit +++ b/lib/nitcc_runtime.nit @@ -116,7 +116,7 @@ abstract class Parser # Should the parser stop # Used by generated parsers - var stop writable = true + var stop = true is writable # Parse a full sequence of tokens and return a complete syntactic tree fun parse: Node @@ -318,7 +318,7 @@ abstract class Node end # The position of the node in the input stream - var position: nullable Position writable = null + var position: nullable Position = null is writable # Produce a graphiz file for the syntaxtic tree rooted at `self`. fun to_dot(filepath: String) @@ -423,7 +423,7 @@ abstract class NToken end # The text associated with the token - var text: String writable = "" + var text: String = "" is writable redef fun to_s do var res = super diff --git a/lib/nitcorn/file_server.nit b/lib/nitcorn/file_server.nit index 348383e..e3471a3 100644 --- a/lib/nitcorn/file_server.nit +++ b/lib/nitcorn/file_server.nit @@ -21,6 +21,7 @@ module file_server import reactor import sessions import media_types +import http_errors redef class String # Returns a `String` copy of `self` without any of the prefixed '/'s @@ -44,6 +45,12 @@ class FileServer # Root of `self` file system var root: String + # Error page template for a given `code` + fun error_page(code: Int): Streamable do return new ErrorTemplate(code) + + # Header of each directory page + var header: nullable Streamable = null is writable + redef fun answer(request, turi) do var response @@ -87,6 +94,12 @@ class FileServer links.add "{file}" end + var header = self.header + var header_code + if header != null then + header_code = header.write_to_string + else header_code = "" + response.body = """ @@ -96,6 +109,7 @@ class FileServer {{{title}}} + {{{header_code}}}

{{{title}}}

+# +# 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. + +# Offers `ErrorTemplate` to display error pages +module http_errors + +import template + +import http_response + +# A basic error page for the HTTP error `code` +class ErrorTemplate + super Template + + # HTTP error code + var code: Int is writable + + # Header on this page + var header: nullable Streamable = null is writable + + # Body to show with this page + var body: nullable Streamable = null is writable + + redef fun rendering + do + var code_message = http_status_codes[code] + var message + if code_message != null then + message = "Error {code}: {code_message}" + else message = "Error {code}" + + add """ + + + + + + """ + add message + add """ + + +""" + + var header = header + if header != null then add header + + add """ +

""" + add message + add "

" + + var body = body + if body != null then add body + + add """ +

+ +""" + end + + redef fun to_s do return write_to_string +end diff --git a/lib/nitcorn/http_request.nit b/lib/nitcorn/http_request.nit index 1a49e0c..07b91ad 100644 --- a/lib/nitcorn/http_request.nit +++ b/lib/nitcorn/http_request.nit @@ -54,6 +54,9 @@ class HttpRequest # The arguments passed with the POST method var post_args = new HashMap[String, String] + + # The arguments passed with the POST or GET method (with a priority on POST) + var all_args = new HashMap[String, String] end # Utility class to parse a request string and build a `HttpRequest` @@ -96,7 +99,10 @@ class HttpRequestParser if http_request.url.has('?') then http_request.uri = first_line[1].substring(0, first_line[1].index_of('?')) http_request.query_string = first_line[1].substring_from(first_line[1].index_of('?')+1) + + var parse_url = parse_url http_request.get_args = parse_url + http_request.all_args.recover_with parse_url else http_request.uri = first_line[1] end @@ -113,6 +119,7 @@ class HttpRequestParser continue end http_request.post_args[parts[0]] = decoded + http_request.all_args[parts[0]] = decoded else print "POST Error: {line} format error on {line}" end diff --git a/lib/opts.nit b/lib/opts.nit index 19b8ff3..a1bffc1 100644 --- a/lib/opts.nit +++ b/lib/opts.nit @@ -29,19 +29,19 @@ abstract class Option var errors: Array[String] = new Array[String] # Is this option mandatory? - var mandatory: Bool writable = false + var mandatory: Bool = false is writable # Is this option hidden from `usage`? - var hidden: Bool writable = false + var hidden: Bool = false is writable # Has this option been read? - var read: Bool writable = false + var read: Bool = false is writable # Current value of this option - var value: VALUE writable + var value: VALUE is writable # Default value of this option - var default_value: VALUE writable + var default_value: VALUE is writable # Create a new option init(help: String, default: VALUE, names: nullable Array[String]) @@ -138,7 +138,7 @@ abstract class OptionParameter protected fun convert(str: String): VALUE is abstract # Is the parameter mandatory? - var parameter_mandatory: Bool writable = true + var parameter_mandatory: Bool = true is writable redef fun read_param(it) do diff --git a/lib/pnacl.nit b/lib/pnacl.nit index b997c3f..bc876c0 100644 --- a/lib/pnacl.nit +++ b/lib/pnacl.nit @@ -24,6 +24,9 @@ # Provides PNaCl support for Nit. module pnacl is platform +import standard +intrude import standard::stream + in "C Header" `{ #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppp.h" diff --git a/lib/scene2d.nit b/lib/scene2d.nit index 18a5d13..ac5a571 100644 --- a/lib/scene2d.nit +++ b/lib/scene2d.nit @@ -23,7 +23,7 @@ abstract class LiveObject fun update do end # Controls whether `update' and `draw' are automatically called by `LiveGroup' - var exists writable = true + var exists = true is writable # Redefine this method to asks how to draw on a view fun draw(view: View) is abstract @@ -37,16 +37,16 @@ class Sprite super LiveObject # x coordinate of the center point - var x: Int writable = 0 + var x: Int = 0 is writable # y coordinate of the center point - var y: Int writable = 0 + var y: Int = 0 is writable # width of the sprite - var width: Int writable = 100 + var width: Int = 100 is writable # height of the sprite - var height: Int writable = 100 + var height: Int = 100 is writable fun left: Int do return x - width/2 fun right: Int do return x + width/2 @@ -54,10 +54,10 @@ class Sprite fun bottom: Int do return y + height/2 # x velocity (applied by `update') - var vx: Int writable = 0 + var vx: Int = 0 is writable # y velocity (applied by `update') - var vy: Int writable = 0 + var vy: Int = 0 is writable redef fun update do diff --git a/lib/socket/socket.nit b/lib/socket/socket.nit index d82e1e5..7dee2ef 100644 --- a/lib/socket/socket.nit +++ b/lib/socket/socket.nit @@ -18,6 +18,7 @@ module socket import socket_c +intrude import standard::stream # Portal for communication between two machines class Socket diff --git a/lib/standard/collection/abstract_collection.nit b/lib/standard/collection/abstract_collection.nit index a806c57..7320e83 100644 --- a/lib/standard/collection/abstract_collection.nit +++ b/lib/standard/collection/abstract_collection.nit @@ -188,7 +188,7 @@ class Container[E] init(e: E) do item = e # The stored item - var item: E writable + var item: E is writable end # This iterator is quite stupid since it is used for only one item. @@ -202,7 +202,7 @@ private class ContainerIterator[E] redef var is_ok: Bool = true - var _container: Container[E] + private var container: Container[E] end # Items can be removed from this collection @@ -929,7 +929,7 @@ private class CoupleMapIterator[K: Object, E] _iter.next end - var _iter: Iterator[Couple[K,E]] + private var iter: Iterator[Couple[K,E]] init(i: Iterator[Couple[K,E]]) do _iter = i end @@ -940,10 +940,10 @@ end class Couple[F, S] # The first element of the couple. - var first: F writable + var first: F is writable # The second element of the couple. - var second: S writable + var second: S is writable # Create a new instance with a first and a second object. init(f: F, s: S) diff --git a/lib/standard/collection/array.nit b/lib/standard/collection/array.nit index b23f533..61e8700 100644 --- a/lib/standard/collection/array.nit +++ b/lib/standard/collection/array.nit @@ -21,8 +21,7 @@ import abstract_collection abstract class AbstractArrayRead[E] super SequenceRead[E] - var _length: Int = 0 - redef fun length do return _length + redef var length = 0 redef fun is_empty do return _length == 0 @@ -347,14 +346,14 @@ class Array[E] end # The internal storage. - var _items: nullable NativeArray[E] = null + private var items: nullable NativeArray[E] = null # Do not use this method # FIXME: Remove it once modules can intrude non local modules fun intern_items: NativeArray[E] do return _items.as(not null) # The size of `_items`. - var _capacity: Int = 0 + private var capacity: Int = 0 redef fun ==(o) do @@ -391,9 +390,9 @@ private class ArrayIterator[E] _index = 0 end - var _index: Int = 0 - redef fun index do return _index - var _array: AbstractArrayRead[E] + redef var index = 0 + + private var array: AbstractArrayRead[E] end private class ArrayReverseIterator[E] @@ -417,7 +416,7 @@ class ArraySet[E: Object] super Set[E] # The stored elements. - var _array: Array[E] + private var array: Array[E] redef fun has(e) do return _array.has(e) @@ -475,7 +474,7 @@ private class ArraySetIterator[E: Object] init(iter: ArrayIterator[E]) do _iter = iter - var _iter: ArrayIterator[E] + private var iter: ArrayIterator[E] end @@ -531,7 +530,7 @@ class ArrayMap[K: Object, E] end # Internal storage. - var _items = new Array[Couple[K,E]] + private var items = new Array[Couple[K,E]] # fast remove the ith element of the array private fun remove_at_index(i: Int) @@ -541,7 +540,7 @@ class ArrayMap[K: Object, E] end # The last positive result given by a index(1) call - var _last_index: Int = 0 + private var last_index: Int = 0 # Where is the `key` in `_item`? # return -1 if not found diff --git a/lib/standard/collection/hash_collection.nit b/lib/standard/collection/hash_collection.nit index 2def742..7c90189 100644 --- a/lib/standard/collection/hash_collection.nit +++ b/lib/standard/collection/hash_collection.nit @@ -19,18 +19,18 @@ import array private abstract class HashCollection[K: Object, N: HashNode[Object]] super ArrayCapable[nullable N] - var _array: nullable NativeArray[nullable N] = null # Used to store items - var _capacity: Int = 0 # Size of _array - var _length: Int = 0 # Number of items in the map + private var array: nullable NativeArray[nullable N] = null # Used to store items + private var capacity: Int = 0 # Size of _array + private var the_length: Int = 0 # Number of items in the map - var _first_item: nullable N = null # First added item (used to visit items in nice order) - var _last_item: nullable N = null # Last added item (same) + private var first_item: nullable N = null # First added item (used to visit items in nice order) + private var last_item: nullable N = null # Last added item (same) # The last key accessed (used for cache) - var _last_accessed_key: nullable K = null + private var last_accessed_key: nullable K = null # The last node accessed (used for cache) - var _last_accessed_node: nullable N = null + private var last_accessed_node: nullable N = null # Return the index of the key k fun index_at(k: K): Int @@ -89,8 +89,8 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]] _last_accessed_node = node # Enlarge if needed - var l = _length - _length = l + 1 + var l = _the_length + _the_length = l + 1 # Magic values determined empirically # We do not want to enlarge too much @@ -123,7 +123,7 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]] end # Remove the item in the array - _length -= 1 + _the_length -= 1 prev = node._prev_in_bucklet next = node._next_in_bucklet if prev != null then @@ -146,7 +146,7 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]] _array[i] = null i -= 1 end - _length = 0 + _the_length = 0 _first_item = null _last_item = null _last_accessed_key = null @@ -157,7 +157,7 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]] do var old_cap = _capacity # get a new capacity - if cap < _length + 1 then cap = _length + 1 + if cap < _the_length + 1 then cap = _the_length + 1 if cap <= _capacity then return _capacity = cap _last_accessed_key = null @@ -191,12 +191,12 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]] end private abstract class HashNode[K: Object] - var _key: K + private var key: K type N: HashNode[K] - var _next_item: nullable N = null - var _prev_item: nullable N = null - var _prev_in_bucklet: nullable N = null - var _next_in_bucklet: nullable N = null + private var next_item: nullable N = null + private var prev_item: nullable N = null + private var prev_in_bucklet: nullable N = null + private var next_in_bucklet: nullable N = null init(k: K) do _key = k @@ -221,9 +221,9 @@ class HashMap[K: Object, V] redef fun iterator: HashMapIterator[K, V] do return new HashMapIterator[K,V](self) - redef fun length do return _length + redef fun length do return _the_length - redef fun is_empty do return _length == 0 + redef fun is_empty do return _the_length == 0 redef fun []=(key, v) do @@ -242,7 +242,7 @@ class HashMap[K: Object, V] init do _capacity = 0 - _length = 0 + _the_length = 0 enlarge(0) end @@ -345,7 +345,7 @@ end private class HashMapNode[K: Object, V] super HashNode[K] redef type N: HashMapNode[K, V] - var _value: V + private var value: V init(k: K, v: V) do @@ -383,10 +383,10 @@ class HashMapIterator[K: Object, V] end # The map to iterate on - var _map: HashMap[K, V] + private var map: HashMap[K, V] # The current node - var _node: nullable HashMapNode[K, V] + private var node: nullable HashMapNode[K, V] init(map: HashMap[K, V]) do @@ -401,13 +401,13 @@ class HashSet[E: Object] super Set[E] super HashCollection[E, HashSetNode[E]] - redef fun length do return _length + redef fun length do return _the_length - redef fun is_empty do return _length == 0 + redef fun is_empty do return _the_length == 0 redef fun first do - assert _length > 0 + assert _the_length > 0 return _first_item._key end @@ -436,7 +436,7 @@ class HashSet[E: Object] init do _capacity = 0 - _length = 0 + _the_length = 0 enlarge(0) end @@ -476,10 +476,10 @@ private class HashSetIterator[E: Object] end # The set to iterate on - var _set: HashSet[E] + private var set: HashSet[E] # The position in the internal map storage - var _node: nullable HashSetNode[E] + private var node: nullable HashSetNode[E] init(set: HashSet[E]) do diff --git a/lib/standard/collection/list.nit b/lib/standard/collection/list.nit index c5dc5dd..08a8459 100644 --- a/lib/standard/collection/list.nit +++ b/lib/standard/collection/list.nit @@ -210,10 +210,10 @@ class List[E] init from(coll: Collection[E]) do append(coll) # The first node of the list - var _head: nullable ListNode[E] + private var head: nullable ListNode[E] # The last node of the list - var _tail: nullable ListNode[E] + private var tail: nullable ListNode[E] # Get the `i`th node. get `null` otherwise. private fun get_node(i: Int): nullable ListNode[E] @@ -295,15 +295,13 @@ class ListIterator[E] end # The current list - var _list: List[E] + private var list: List[E] # The current node of the list - var _node: nullable ListNode[E] + private var node: nullable ListNode[E] # The index of the current node - var _index: Int - - redef fun index do return _index + redef var index # Remove the current item fun delete diff --git a/lib/standard/collection/range.nit b/lib/standard/collection/range.nit index e72771e..31ffaa2 100644 --- a/lib/standard/collection/range.nit +++ b/lib/standard/collection/range.nit @@ -76,9 +76,8 @@ end private class IteratorRange[E: Discrete] # Iterator on ranges. super Iterator[E] - var _range: Range[E] - var _item: E - redef fun item do return _item + private var range: Range[E] + redef var item redef fun is_ok do return _item < _range.after diff --git a/lib/standard/error.nit b/lib/standard/error.nit new file mode 100644 index 0000000..f40444d --- /dev/null +++ b/lib/standard/error.nit @@ -0,0 +1,91 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). +# +# This file is free software, which comes along with NIT. This software is +# distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. You can modify it is you want, provided this header +# is kept unaltered, and a notification of the changes is added. +# You are allowed to redistribute it and sell it, alone or is a part of +# another product. + +# Standard error-management infrastructure. +# +module error + +import string + +# Standard class for error messages +class Error + # A short human-readable error message. + # + # This message is short and informative and could be displayed on the console, a dialog-box + # or written in a log file. + # + # Message should be explicative, autonomous and do not depend on contextual information. + # + # Eg. instead of "Fatal error: cannot open file", + # something like "File error, cannot open /some/path/document.ext, file not found." is preferred, + # where the message is informative as it, and the severity of the error is not assumed: + # while fatal for the library, it could be something benign for the program. + var message: String + + # An original error that caused the creation of this error, if any. + # + # This is used to chain errors and track the implication of various sub-systems for a given error. + # + # When displaying an error the end user, causes can be recursively displayed. + var cause: nullable Error = null is writable + + redef fun to_s do return message +end + +# Helper class used as a return value of methods that may give errors instead of values. +# +# Functions that return useful values or errors could use it to simulate an easy-to use multiple-return. +# +# ~~~ +# fun division(a,b: Int): MaybeError[Int, Error] +# do +# if b == 0 then return new MaybeError[Int, Error](null, new Error("Arithmetic Error: try to divide {a} by 0")) +# return new MaybeError[Int, Error](a / b, null) +# end +# +# assert division(10, 2).is_error == false +# assert division(10, 0).is_error == true +# ~~~ +# +# Clients has to handle the error: +# +# ~~~ +# var res = division(10, 2) +# if res.is_error then +# print res.error +# exit 1 +# end +# print res.value +# assert res.value == 5 +# ~~~ +class MaybeError[V, E: Error] + # The value, if any + var maybe_value: nullable V + + # The error, if any + var maybe_error: nullable E + + # It there an error? + fun is_error: Bool do return maybe_error != null + + # The value + # REQUIRE: `not is_error` + fun value: V do return maybe_value.as(V) + + # The require + # REQUIRE: `is_error` + fun error: E do return maybe_error.as(E) + + redef fun to_s do + var e = maybe_error + if e != null then return e.to_s + return value.to_s + end +end diff --git a/lib/standard/file.nit b/lib/standard/file.nit index f7883f6..06001df 100644 --- a/lib/standard/file.nit +++ b/lib/standard/file.nit @@ -36,7 +36,7 @@ abstract class FStream var path: nullable String = null # The FILE *. - var _file: nullable NativeFile = null + private var file: nullable NativeFile = null fun file_stat: FileStat do return _file.file_stat @@ -103,7 +103,7 @@ class OFStream redef fun write(s) do - assert _writable + assert _is_writable if s isa FlatText then write_native(s.to_cstring, s.length) else @@ -111,21 +111,18 @@ class OFStream end end - redef fun is_writable do return _writable - redef fun close do var i = _file.io_close - _writable = false + _is_writable = false end - # Is the file open in write mode - var _writable: Bool + redef var is_writable = false # Write `len` bytes from `native`. private fun write_native(native: NativeString, len: Int) do - assert _writable + assert _is_writable var err = _file.io_write(native, len) if err != len then # Big problem @@ -141,7 +138,7 @@ class OFStream print "Error: Opening file at '{path}' failed with '{sys.errno.strerror}'" end self.path = path - _writable = true + _is_writable = true end private init do end @@ -168,7 +165,7 @@ class Stdout private init do _file = new NativeFile.native_stdout path = "/dev/stdout" - _writable = true + _is_writable = true end end @@ -177,7 +174,7 @@ class Stderr private init do _file = new NativeFile.native_stderr path = "/dev/stderr" - _writable = true + _is_writable = true end end @@ -529,13 +526,13 @@ end redef class Sys # Standard input - var stdin: PollableIStream protected writable = new Stdin + var stdin: PollableIStream = new Stdin is protected writable # Standard output - var stdout: OStream protected writable = new Stdout + var stdout: OStream = new Stdout is protected writable # Standard output for errors - var stderr: OStream protected writable = new Stderr + var stderr: OStream = new Stderr is protected writable end diff --git a/lib/standard/re.nit b/lib/standard/re.nit new file mode 100644 index 0000000..7baabd2 --- /dev/null +++ b/lib/standard/re.nit @@ -0,0 +1,408 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). +# +# Copyright 2014 Alexis LaferriÃ¨re +# +# 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. + +# Regular expression support for all services based on `Pattern` +# +# Implemented using libc regular expressions. +# +# The main entities are `Text::to_re` and `Regex`. +module re + +import string_search +import gc +import error + +in "C Header" `{ + #include + #include +`} + +# Main extern class to wrap libc regular expression support +# +# It is recommanded to use the higher level API offered by the class `Regex`, +# but it can still be used for advanced purpose or in optimized code. +# +# To use this class and other `private` entities of this module, use `intrude import standard::re` +private extern class NativeRegex `{ regex_t* `} + # Allocate a new `NativeRegex`, it must then be compiled using `regcomp` before calling `regexec` + new malloc `{ return malloc(sizeof(regex_t)); `} + + # Compile the regular expression `regex` into a form that is suitable for subsequent `regexec` searches + fun regcomp(regex: NativeString, cflags: Int): Int `{ + return regcomp(recv, regex, cflags); + `} + + # Match `string` against the precompiled pattern buffer of `self`, locating matches + # + # `nmatch` and `pmatch` are used to provide information regarding the location of any matches. + # `eflags` may be the bitwise-or of one or both of `flag_notbol` and `flag_noteol`. + fun regexec(string: NativeString, nmatch: Int, pmatch: NativeMatchArray, eflags: Int): Int `{ + return regexec(recv, string, nmatch, pmatch, eflags); + `} + + # Match `string` against the precompiled pattern buffer of `self`, do not locate matches + # + # `eflags` may be the bitwise-or of one or both of `flag_notbol` and `flag_noteol`. + fun regexec_match_only(string: NativeString, eflags: Int): Int `{ + return regexec(recv, string, 0, NULL, eflags); + `} + + # Free the memory allocated to the pattern buffer by the compiling process + # + # Does not free the memory holding `self`, use `free` for this purpose. + fun regfree `{ regfree(recv); `} + + # Turn the error codes that can be returned by both `regcomp` and `regexec` into error message strings + fun regerror(errcode: Int): NativeString `{ + size_t len = regerror(errcode, recv, NULL, 0); + char *message = malloc(len); + regerror(errcode, recv, message, len); + + return message; + `} + + # This field holds the number of parenthetical subexpressions in the regular expression that was compiled. + fun re_nsub: Int `{ return recv->re_nsub; `} +end + +# Flags for `NativeRegex::regcomp` + +private fun flag_extended: Int `{ return REG_EXTENDED; `} +private fun flag_icase: Int `{ return REG_ICASE; `} +private fun flag_nosub: Int `{ return REG_NOSUB; `} +private fun flag_newline: Int `{ return REG_NEWLINE; `} + +# Flags for `NativeRegex::regexec` + +private fun flag_notbol: Int `{ return REG_NOTBOL; `} +private fun flag_noteol: Int `{ return REG_NOTEOL; `} + +# Errors of `NativeRegex::regexec` + +private fun error_nomatch: Int `{ return REG_NOMATCH; `} +private fun error_espace: Int `{ return REG_ESPACE; `} + +redef universal Int + private fun is_nomatch: Bool `{ return recv == REG_NOMATCH; `} +end + +# An array of `regmatch_t` or a pointer to one +private extern class NativeMatchArray `{ regmatch_t* `} + # Allocate a new array of `length` `regmatch_t` + new malloc(length: Int) `{ return malloc(length * sizeof(regmatch_t)); `} + + # The offset in string of the beginning of a substring + fun rm_so: Int `{ return recv->rm_so; `} + + # The offset in string of the end of the substring + fun rm_eo: Int `{ return recv->rm_eo; `} + + # Get a pointer to the element at `index`, can also be used as a subarray + fun [](index: Int): NativeMatchArray `{ return recv + index; `} +end + +redef extern class NativeString + private fun substring_from(index: Int): NativeString `{ return recv + index; `} +end + +redef class Text + # Get a `Regex` instance from `self` + fun to_re: Regex do return new Regex(self.to_s) +end + +# A regular expression pattern +# +# Used as a `Pattern` on intances of `Text` to call `has`, `search_all`, `replace`, etc. +# +# Example: +# +# var re = "ab+a".to_re +# assert "aabbbbaaaaba".search_all(re).join(", ") == "abbbba, aba" +# assert "aabbbbaaaaba".has(re) +# assert "aabbbbaaaaba".replace(re, "+") == "a+aa+" +# assert "aabbbbaaaaba".split(re) == ["a", "aa", ""] +class Regex + super Finalizable + super Pattern + + # The `String` source of this regular expression + var string: String is writable + + # Treat the pattern as a POSIX extended regular expression (the default) + # + # If `false`, it is treated as a POSIX basic regular expression (BRE). + # + # The extended syntax supports `?`, `+` and `|`. Also, `\` causes the following + # character to be used as literal. + var extended = true is writable + + # Ignore case when matching letters + var ignore_case = false is writable + + # Optimize `self` for `is_in` and `String::has`, but do not support searches + # + # If `true`, `self` cannont be used with `String::search_all`, `String::replace` + # or `String::split`. + var optimize_is_in = false is writable + + # Treat a newline in string as dividing string into multiple lines + # + # So that `$` can match before the newline and `^` can match after. + # Also, donât permit `.` to match a newline, and donât permit `[^â¦]` to match a newline. + # + # Otherwise, newline acts like any other ordinary character. + var newline = false is writable + + # Do not regard the beginning of the specified string as the beginning of a line + # + # More generally, donât make any assumptions about what text might precede it. + var not_bol = false is writable + + # Do not regard the end of the specified string as the end of a line + # + # More generally, donât make any assumptions about what text might follow it. + var not_eol = false is writable + + # Cache of the last used compiled regular expression + private var native: nullable NativeRegex = null + + # Cache of a single `regmatch_t` to prevent many calls to `malloc` + private var native_match = new NativeMatchArray.malloc(0) is lazy + + # `cflags` of the last successful `compile` + private var cflags_cache = 0 + + # `string` of the last successful `compile` + private var string_cache: nullable String = null + + # Compile the regular expression, if needed + # + # Return `null` on success and an `Error` otherwise. + # + # This method is always called by `get_match` and `has_match`, but the user + # should call it to check for errors. + # + # assert "ab".to_re.compile == null + # assert "[ab".to_re.compile.message == "Unmatched [ or [^" + fun compile: nullable Error + do + var cflags = 0 + if extended then cflags = cflags.bin_or(flag_extended) + if ignore_case then cflags = cflags.bin_or(flag_icase) + if optimize_is_in then cflags = cflags.bin_or(flag_nosub) + if newline then cflags = cflags.bin_or(flag_newline) + + var native = self.native + var need_compilation = native == null or cflags != cflags_cache or string != string_cache + + if need_compilation then + + # Initial allocation + if native == null then + native = new NativeRegex.malloc + self.native = native + end + + var res = native.regcomp(string.to_cstring, cflags) + + # All is good + if res == 0 then + # Update the cache + self.native = native + + # We store these to know if we need to recompile or not + self.cflags_cache = cflags + self.string_cache = string + + return null + end + + var error_cstr = native.regerror(res) + + # We leave it to the lib to decide how to allocate the string that we keep + var error_str = error_cstr.to_s_with_copy + error_cstr.free + + return new Error(error_str) + end + + return null + end + + redef fun finalize + do + var native = self.native + if native != null then + native.regfree + native.free + self.native = null + self.native_match.free + end + end + + private fun gather_eflags: Int + do + var eflags = 0 + if not_bol then eflags = eflags.bin_or(flag_notbol) + if not_eol then eflags = eflags.bin_or(flag_noteol) + return eflags + end + + private fun get_error(errcode: Int): String + do + # Error, should be out of memory but we cover any possible error anyway + var error_cstr = native.regerror(errcode) + + # We leave it to the lib to decide how to allocate the string that we keep + var error_str = error_cstr.to_s_with_copy + error_cstr.free + + return error_str + end + + # assert "ab".to_re.is_in("abcd") + # assert "ab".to_re.is_in("cdab") + # assert not "ab".to_re.is_in("acdb") + # assert "ab".to_re.is_in("ab") + redef fun is_in(text) + do + var comp_res = compile + assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + + # Actually execute + var eflags = gather_eflags + var res = native.regexec_match_only(text.to_cstring, eflags) + + # Got a match? + if res == 0 then return true + + # Got no match, not an error? + if res.is_nomatch then return false + + # Error, should be out of memory but we cover any possible error anyway + var error_str = get_error(res) + "Regex search failed with: {error_str}\n".output + abort + end + + # require: not optimize_is_in + # + # assert "l".to_re.search_index_in("hello world", 0) == 2 + # assert "el+o".to_re.search_index_in("hello world", 0) == 1 + # assert "l+".to_re.search_index_in("hello world", 3) == 3 + # assert "z".to_re.search_index_in("hello world", 0) == -1 + redef fun search_index_in(text, from) + do + assert not optimize_is_in + + var comp_res = compile + assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + + # Actually execute + text = text.to_s + var cstr = text.substring_from(from).to_cstring + var eflags = gather_eflags + var match = self.native_match + + var res = native.regexec(cstr, 1, match, eflags) + + # Found one? + if res == 0 then return match.rm_so + from + + # No more match? + if res.is_nomatch then return -1 + + # Error, should be out of memory but we cover any possible error anyway + var error_str = get_error(res) + "Regex search failed with: {error_str}\n".output + abort + end + + # require: not optimize_is_in + # + # assert "l".to_re.search_in("hello world", 0).from == 2 + # assert "el+o".to_re.search_in("hello world", 0).from == 1 + # assert "l+".to_re.search_in("hello world", 3).from == 3 + # assert "z".to_re.search_in("hello world", 0) == null + redef fun search_in(text, from) + do + assert not optimize_is_in + + var comp_res = compile + assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + + # Actually execute + text = text.to_s + var cstr = text.substring_from(from).to_cstring + var eflags = gather_eflags + var match = self.native_match + var matches = new Array[Match] + + var res = native.regexec(cstr, 1, match, eflags) + + # Found one? + if res == 0 then return new Match(text, from + match.rm_so, match.rm_eo - match.rm_so) + + # No more match? + if res.is_nomatch then return null + + # Error, should be out of memory but we cover any possible error anyway + var error_str = get_error(res) + "Regex search failed with: {error_str}\n".output + abort + end + + # require: not optimize_is_in + # + # assert "ab".to_re.search_all_in("abbab").join(", ") == "ab, ab" + # assert "b+".to_re.search_all_in("abbabaabbbbbcab").join(", ") == "bb, b, bbbbb, b" + redef fun search_all_in(text) + do + assert not optimize_is_in + + var comp_res = compile + assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + + # Actually execute + text = text.to_s + var cstr = text.to_cstring + var eflags = gather_eflags + var eflags_or_notbol = eflags.bin_or(flag_notbol) + var match = self.native_match + var matches = new Array[Match] + + var res = native.regexec(cstr, 1, match, eflags) + var d = 0 + while res == 0 do + matches.add new Match(text, d + match.rm_so, match.rm_eo - match.rm_so) + if d == match.rm_eo then + d += 1 + else d = d + match.rm_eo + cstr = cstr.substring_from(match.rm_eo) + res = native.regexec(cstr, 1, match, eflags_or_notbol) + end + + # No more match? + if res.is_nomatch then return matches + + # Error, should be out of memory but we cover any possible error anyway + var error_str = get_error(res) + "Regex search failed with: {error_str}\n".output + abort + end + + redef fun to_s do return "/{string}/" +end diff --git a/lib/standard/standard.nit b/lib/standard/standard.nit index 5becb03..4550113 100644 --- a/lib/standard/standard.nit +++ b/lib/standard/standard.nit @@ -30,3 +30,5 @@ import gc import bitset import queue import numeric +import error +import re diff --git a/lib/standard/stream.nit b/lib/standard/stream.nit index d14e82f..5932daa 100644 --- a/lib/standard/stream.nit +++ b/lib/standard/stream.nit @@ -250,10 +250,10 @@ abstract class BufferedIStream redef fun eof do return _buffer_pos >= _buffer.length and end_reached # The buffer - var _buffer: nullable FlatBuffer = null + private var buffer: nullable FlatBuffer = null # The current position in the buffer - var _buffer_pos: Int = 0 + private var buffer_pos: Int = 0 # Fill the buffer protected fun fill_buffer is abstract diff --git a/lib/standard/string.nit b/lib/standard/string.nit index 821672e..38bd492 100644 --- a/lib/standard/string.nit +++ b/lib/standard/string.nit @@ -16,6 +16,7 @@ module string import math import collection +intrude import collection::array `{ #include @@ -156,13 +157,6 @@ abstract class Text return self.chars.iterator end - # Is 'c' contained in self ? - # - # DEPRECATED : Use self.chars.has instead - fun has(c: Char): Bool - do - return self.chars.has(c) - end # Gets an Array containing the chars of self # @@ -178,7 +172,7 @@ abstract class Text # As with substring, a `from` index < 0 will be replaced by 0 fun substring_from(from: Int): SELFTYPE do - if from > self.length then return empty + if from >= self.length then return empty if from < 0 then from = 0 return substring(from, length - from) end @@ -364,7 +358,7 @@ abstract class Text if iter.item.ascii > 32 then break iter.next end - if iter.index == length then return self.empty + if iter.index < 0 then return self.empty return self.substring(0, iter.index + 1) end @@ -1136,7 +1130,7 @@ private class FlatStringReverseIterator curr_pos = pos + tgt.index_from end - redef fun is_ok do return curr_pos >= 0 + redef fun is_ok do return curr_pos >= target.index_from redef fun item do return target_items[curr_pos] @@ -1874,8 +1868,9 @@ redef class Array[E] else for j in tmp.substrings do var s = j.as(FlatString) - s.items.copy_to(ns, tpl, s.index_from, off) - off += tpl + var slen = s.length + s.items.copy_to(ns, slen, s.index_from, off) + off += slen end end i += 1 @@ -1967,7 +1962,7 @@ interface StringCapable end redef class Sys - var _args_cache: nullable Sequence[String] + private var args_cache: nullable Sequence[String] # The arguments of the program as given by the OS fun program_args: Sequence[String] diff --git a/lib/standard/string_search.nit b/lib/standard/string_search.nit index ef18e08..5aeac25 100644 --- a/lib/standard/string_search.nit +++ b/lib/standard/string_search.nit @@ -84,6 +84,8 @@ interface Pattern res.add(new Match(s.to_s, i, s.length - i)) return res end + + protected fun is_in(s: Text): Bool do return search_index_in(s, 0) != -1 end # BM_Pattern are pre-compiled string motif for the Boyer-Moore algorithm. @@ -149,10 +151,10 @@ class BM_Pattern end # searched motif - var _motif: String + private var motif: String # length of the motif - var _length: Int + private var length: Int private fun bc(e: Char): Int do @@ -164,10 +166,10 @@ class BM_Pattern end # good shifts - var _gs: Array[Int] + private var gs: Array[Int] # bad characters - var _bc_table: Map[Char, Int] + private var bc_table: Map[Char, Int] private fun compute_bc do @@ -374,4 +376,11 @@ redef class Text do return self.split_with(p).join(string) end + + # Does `self` contains at least one instance of `pattern`? + # + # assert "hello".has('l') + # assert "hello".has("ll") + # assert not "hello".has("lll") + fun has(pattern: Pattern): Bool do return pattern.is_in(self) end diff --git a/lib/string_experimentations/utf8.nit b/lib/string_experimentations/utf8.nit index 7261820..14f8550 100644 --- a/lib/string_experimentations/utf8.nit +++ b/lib/string_experimentations/utf8.nit @@ -401,7 +401,7 @@ end redef class OFStream redef fun write(s) do - assert _writable + assert is_writable if s isa FlatText then if s isa FlatString then write_native(s.to_cstring, s.bytelen) diff --git a/lib/string_experimentations/utf8_noindex.nit b/lib/string_experimentations/utf8_noindex.nit index bf49334..16c2502 100644 --- a/lib/string_experimentations/utf8_noindex.nit +++ b/lib/string_experimentations/utf8_noindex.nit @@ -732,7 +732,7 @@ end redef class OFStream redef fun write(s) do - assert _writable + assert is_writable if s isa FlatText then write_native(s.to_cstring, s.bytelen) else for i in s.substrings do write_native(i.to_cstring, i.length) diff --git a/lib/symbol.nit b/lib/symbol.nit index d268763..1e9fb67 100644 --- a/lib/symbol.nit +++ b/lib/symbol.nit @@ -31,7 +31,7 @@ end # A symbol is a unique immutable string class Symbol - var _string: String + private var string: String redef fun to_s do return _string.to_s # Only used by String::to_symbol diff --git a/lib/test_suite.nit b/lib/test_suite.nit new file mode 100644 index 0000000..6261eea --- /dev/null +++ b/lib/test_suite.nit @@ -0,0 +1,51 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). +# +# 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. + +# Common interface for `nitunit` test-suites. +module test_suite is + # Annotation used by test-suite modules. + new_annotation test_suite +end + +# A test-suite that can be executed by `nitunit`. +# +# All test-suite classes must implement `TestSuite`. +class TestSuite + # Internal empty init. + private init nitunit do end + + # Method called before each test-case. + # + # Redefine this method to factorize code that have to be + # executed before every test. + fun before_test do end + + # Method called after each test-case. + # + # Redefine this method to factorize code that have to be + # executed after every test. + fun after_test do end +end + +# Method called before each test-suite. +# +# Redefine this method to factorize code that have to be +# executed before every test suite. +fun before_module do end + +# Method called after each test-suite. +# +# Redefine this method to factorize code that have to be +# executed after every test suite. +fun after_module do end diff --git a/lib/trees/abstract_tree.nit b/lib/trees/abstract_tree.nit index 0b79490..d05663e 100644 --- a/lib/trees/abstract_tree.nit +++ b/lib/trees/abstract_tree.nit @@ -28,7 +28,7 @@ abstract class TreeMap[K: Comparable, E] protected type N: TreeNode[K, E] # The `root` node of the tree (null if tree is empty) - protected var root: nullable N protected writable = null + protected var root: nullable N = null is protected writable # Display the tree in a gaphical windows # Graphviz with a working -Txlib is expected @@ -51,7 +51,7 @@ class TreeNode[K: Comparable, E] var value: E # Direct parent of this node (null if the node is root) - var parent: nullable SELF writable = null + var parent: nullable SELF = null is writable redef fun to_s do return "\{{value or else ""}\}" diff --git a/lib/websocket.nit b/lib/websocket.nit index 3179014..201fa92 100644 --- a/lib/websocket.nit +++ b/lib/websocket.nit @@ -22,6 +22,8 @@ import socket import sha1 import base64 +intrude import standard::stream + # Websocket compatible server, works as an extra layer to the original Sockets class WebSocket super BufferedIStream diff --git a/lib/x11.nit b/lib/x11.nit index b4f51d5..df0b984 100644 --- a/lib/x11.nit +++ b/lib/x11.nit @@ -15,7 +15,7 @@ # limitations under the License. # Serices from the X11 library -module x11 is pkgconfig("x11") +module x11 is pkgconfig # Open the current display from the environment variables # diff --git a/misc/vim/syntax_checkers/nit/nitg.vim b/misc/vim/syntax_checkers/nit/nitg.vim index f12f3ed..586b151 100644 --- a/misc/vim/syntax_checkers/nit/nitg.vim +++ b/misc/vim/syntax_checkers/nit/nitg.vim @@ -23,12 +23,12 @@ let loaded_syntastic_nit_nitg_checker = 1 if exists('g:syntastic_nitg') let s:nitg = g:syntastic_nitg else - let s:nitg = "nitc" + let s:nitg = "nitpick" endif if !executable(s:nitg) if exists('g:syntastic_nitg') - echo "Syntastic for Nit error: Custom nitg cannot be found at: " . g:syntastic_nitg + echo "Syntastic for Nit error: Custom tool cannot be found at: " . g:syntastic_nitg endif finish endif diff --git a/share/nitdoc/css/nitdoc.css b/share/nitdoc/css/nitdoc.css index 3f200bc..0fd73b7 100644 --- a/share/nitdoc/css/nitdoc.css +++ b/share/nitdoc/css/nitdoc.css @@ -147,23 +147,23 @@ h3 { #content>.col { height: 100%; - overflow: hidden; -} - -#content>.col:hover { overflow-y: scroll; } -#content>.col::-webkit-scrollbar { - width: 7px; - height: 7px; +#content>.col::-webkit-scrollbar-thumb { + background: transparent; } -#content>.col::-webkit-scrollbar-thumb { +#content>.col:hover::-webkit-scrollbar-thumb { background: #CCC; -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10),inset 0 -1px 0 rgba(0,0,0,0.07); } +#content>.col::-webkit-scrollbar { + width: 7px; + height: 7px; +} + #content>.col::-webkit-scrollbar-thumb:hover { background: #999; } diff --git a/src/Makefile b/src/Makefile index 44f2a21..2f3d7a1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ NITCOPT= OLDNITCOPT= -OBJS=nitdoc nitmetrics nitg nit nitx nitunit nitlight nitls nitdbg_client nitserial +OBJS=nitg nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitdbg_client nitserial SRCS=$(patsubst %,%.nit,$(OBJS)) BINS=$(patsubst %,../bin/%,$(OBJS)) diff --git a/src/annotation.nit b/src/annotation.nit index 8d9ca25..6641280 100644 --- a/src/annotation.nit +++ b/src/annotation.nit @@ -15,9 +15,8 @@ # Management and utilities on annotations module annotation -import parser import modelbuilder -import literal +private import literal import model::mmodule_data redef class Prod diff --git a/src/astbuilder.nit b/src/astbuilder.nit index 3b5aceb..8e17b4e 100644 --- a/src/astbuilder.nit +++ b/src/astbuilder.nit @@ -15,10 +15,10 @@ # Instantiation and transformation of semantic nodes in the AST of expressions and statements module astbuilder -intrude import typing -intrude import literal -intrude import parser -intrude import scope +intrude import semantize::typing +intrude import semantize::literal +intrude import semantize::parser +intrude import semantize::scope # General factory to build semantic nodes in the AST of expressions class ASTBuilder diff --git a/src/astprinter.nit b/src/astprinter.nit index 97ff1fd..e0aceee 100644 --- a/src/astprinter.nit +++ b/src/astprinter.nit @@ -17,10 +17,9 @@ # print AST in an human form module astprinter -import typing -import phase +import semantize intrude import parser -import literal +private import literal private class ASTPrinterVisitor super Visitor diff --git a/src/astvalidation.nit b/src/astvalidation.nit index 913ee21..b78632b 100644 --- a/src/astvalidation.nit +++ b/src/astvalidation.nit @@ -15,7 +15,6 @@ # Check the consitency of AST module astvalidation -private import typing intrude import parser import astbuilder @@ -52,7 +51,7 @@ redef class ANode end v.seen.add(self) - if _location == null then + if not isset _location then #debug "LOCATION: unlocated node {v.path.join(", ")}" _location = self.parent.location end diff --git a/src/common_ffi/c.nit b/src/common_ffi/c.nit index 4e4402c..92697f5 100644 --- a/src/common_ffi/c.nit +++ b/src/common_ffi/c.nit @@ -72,8 +72,8 @@ redef class Location end redef class MModule - var c_compiler_options writable = "" - var c_linker_options writable = "" + var c_compiler_options = "" is writable + var c_linker_options = "" is writable end class ForeignCType diff --git a/src/common_ffi/common_ffi.nit b/src/common_ffi/common_ffi.nit index 302c472..814c882 100644 --- a/src/common_ffi/common_ffi.nit +++ b/src/common_ffi/common_ffi.nit @@ -19,7 +19,6 @@ # to wrap foreign code in Nit methods. module common_ffi -import parser import modelbuilder import nitni @@ -136,7 +135,7 @@ redef class VerifyNitniCallbacksPhase do super - if not npropdef isa AExternPropdef then return + if not npropdef isa AMethPropdef then return var code_block = npropdef.n_extern_code_block if code_block == null then return diff --git a/src/common_ffi/cpp.nit b/src/common_ffi/cpp.nit index 8cdce81..06f8f25 100644 --- a/src/common_ffi/cpp.nit +++ b/src/common_ffi/cpp.nit @@ -27,7 +27,7 @@ end redef class MModule private var cpp_file: nullable CPPCompilationUnit = null - var cpp_compiler_options writable = "" + var cpp_compiler_options = "" is writable end class CPPLanguage diff --git a/src/common_ffi/java.nit b/src/common_ffi/java.nit index 571c319..d3a7b68 100644 --- a/src/common_ffi/java.nit +++ b/src/common_ffi/java.nit @@ -251,7 +251,7 @@ redef class MModule private fun impl_java_class_name: String do return "Nit_{name}" end -redef class AExternPropdef +redef class AMethPropdef redef fun verify_nitni_callbacks(toolcontext) do super diff --git a/src/common_ffi/pkgconfig.nit b/src/common_ffi/pkgconfig.nit index 5306b97..335d8d1 100644 --- a/src/common_ffi/pkgconfig.nit +++ b/src/common_ffi/pkgconfig.nit @@ -20,6 +20,7 @@ module pkgconfig import c private import annotation +private import literal redef class ToolContext var pkgconfig_phase: Phase = new PkgconfigPhase(self, [literal_phase]) @@ -42,27 +43,29 @@ class PkgconfigPhase return end - var args = nat.n_args - if args.is_empty then - modelbuilder.error(nat, "Syntax error: \"pkgconfig\" expects at least one argument.") - return - end + # retreive module + var nmodule = nmoduledecl.parent.as(AModule) + var mmodule = nmodule.mmodule.as(not null) + # target pkgs var pkgs = new Array[String] - for arg in args do - var pkg = arg.as_string - if pkg == null then - modelbuilder.error(nat, "Syntax error: \"pkgconfig\" expects its arguments to be the name of the package as String literals.") - return - end - pkgs.add(pkg) + var args = nat.n_args + if args.is_empty then + # use module name + pkgs.add(mmodule.name) + else + for arg in args do + var pkg = arg.as_string + if pkg == null then + modelbuilder.error(nat, "Syntax error: \"pkgconfig\" expects its arguments to be the name of the package as String literals.") + return + end + + pkgs.add(pkg) + end end - # retreive module - var nmodule = nmoduledecl.parent.as(AModule) - var mmodule = nmodule.mmodule.as(not null) - # check availability of pkg-config var proc_which = new IProcess("which", "pkg-config") proc_which.wait diff --git a/src/abstract_compiler.nit b/src/compiler/abstract_compiler.nit similarity index 96% rename from src/abstract_compiler.nit rename to src/compiler/abstract_compiler.nit index 9e67eae..ef02aec 100644 --- a/src/abstract_compiler.nit +++ b/src/compiler/abstract_compiler.nit @@ -18,10 +18,10 @@ module abstract_compiler import literal -import typing -import auto_super_init +import semantize import platform import c_tools +private import annotation # Add compiling options redef class ToolContext @@ -395,7 +395,7 @@ class MakefileToolchain if f.compiles_to_o_file then ofiles.add(o) if f.add_to_jar then java_files.add(f) end - + if not java_files.is_empty then var jar_file = "{outpath}.jar" @@ -445,13 +445,13 @@ abstract class AbstractCompiler # The main module of the program currently compiled # Is assigned during the separate compilation - var mainmodule: MModule writable + var mainmodule: MModule is writable # The real main module of the program var realmainmodule: MModule # The modeulbuilder used to know the model and the AST - var modelbuilder: ModelBuilder protected writable + var modelbuilder: ModelBuilder is protected writable # Is hardening asked? (see --hardening) fun hardening: Bool do return self.modelbuilder.toolcontext.opt_hardening.value @@ -480,7 +480,7 @@ abstract class AbstractCompiler fun new_visitor: VISITOR is abstract # Where global declaration are stored (the main .h) - var header: CodeWriter writable + var header: CodeWriter is writable # Provide a declaration that can be requested (before or latter) by a visitor fun provide_declaration(key: String, s: String) @@ -643,10 +643,12 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref ); end # Generate the main C function. + # # This function: - # * allocate the Sys object if it exists - # * call init if is exists - # * call main if it exists + # + # * allocate the Sys object if it exists + # * call init if is exists + # * call main if it exists fun compile_main_function do var v = self.new_visitor @@ -930,12 +932,13 @@ extern void nitni_global_ref_decr( struct nitni_ref *ref ) { end # Display stats about compilation process + # # Metrics used: - # * type tests against resolved types (`x isa Collection[Animal]`) - # * type tests against unresolved types (`x isa Collection[E]`) - # * type tests skipped - # * type tests total - # * + # + # * type tests against resolved types (`x isa Collection[Animal]`) + # * type tests against unresolved types (`x isa Collection[E]`) + # * type tests skipped + # * type tests total fun display_stats do if self.modelbuilder.toolcontext.opt_typing_test_metrics.value then @@ -1015,10 +1018,10 @@ abstract class AbstractCompilerVisitor var compiler: COMPILER # The current visited AST node - var current_node: nullable ANode writable = null + var current_node: nullable ANode = null is writable # The current `Frame` - var frame: nullable Frame writable + var frame: nullable Frame is writable # Alias for self.compiler.mainmodule.object_type fun object_type: MClassType do return self.compiler.mainmodule.object_type @@ -1261,7 +1264,7 @@ abstract class AbstractCompilerVisitor private var escapemark_names = new HashMap[EscapeMark, String] # Return a "const char*" variable associated to the classname of the dynamic type of an object - # NOTE: we do not return a `RuntimeVariable` "NativeString" as the class may not exist in the module/program + # NOTE: we do not return a `RuntimeVariable` "NativeString" as the class may not exist in the module/program fun class_name_string(value: RuntimeVariable): String is abstract # Variables handling @@ -1332,7 +1335,7 @@ abstract class AbstractCompilerVisitor var mtype = recv.mtype var finalizable_type = compiler.mainmodule.finalizable_type if finalizable_type != null and not mtype.need_anchor and - mtype.is_subtype(compiler.mainmodule, null, finalizable_type) then + mtype.is_subtype(compiler.mainmodule, null, finalizable_type) then add "gc_register_finalizer({recv});" end end @@ -1541,7 +1544,7 @@ abstract class AbstractRuntimeFunction # Non cached version of `c_name` protected fun build_c_name: String is abstract - protected var c_name_cache: nullable String writable = null + protected var c_name_cache: nullable String = null is writable # Implements a call of the runtime_function # May inline the body or generate a C function call @@ -1564,11 +1567,11 @@ class RuntimeVariable var mtype: MType # The current casted type of the variable (as known in Nit) - var mcasttype: MType writable + var mcasttype: MType is writable # If the variable exaclty a mcasttype? # false (usual value) means that the variable is a mcasttype or a subtype. - var is_exact: Bool writable = false + var is_exact: Bool = false is writable init(name: String, mtype: MType, mcasttype: MType) do @@ -1618,10 +1621,10 @@ class Frame var arguments: Array[RuntimeVariable] # The runtime_variable associated to the return (in a function) - var returnvar: nullable RuntimeVariable writable = null + var returnvar: nullable RuntimeVariable = null is writable # The label at the end of the property - var returnlabel: nullable String writable = null + var returnlabel: nullable String = null is writable end redef class MType @@ -1636,7 +1639,7 @@ redef class MType # Return the name of the C structure associated to a Nit live type fun c_name: String is abstract - protected var c_name_cache: nullable String protected writable + protected var c_name_cache: nullable String is protected writable end redef class MClassType @@ -1889,6 +1892,18 @@ redef class AMethPropdef v.supercall(mpropdef, arguments.first.mtype.as(MClassType), arguments) end + # Try special compilation + if mpropdef.is_intern then + if compile_intern_to_c(v, mpropdef, arguments) then return + else if mpropdef.is_extern then + if mpropdef.mproperty.is_init then + if compile_externinit_to_c(v, mpropdef, arguments) then return + else + if compile_externmeth_to_c(v, mpropdef, arguments) then return + end + end + + # Compile block if any var n_block = n_block if n_block != null then for i in [0..mpropdef.msignature.arity[ do @@ -1896,17 +1911,13 @@ redef class AMethPropdef v.assign(v.variable(variable), arguments[i+1]) end v.stmt(n_block) - else if mpropdef.is_intern then - compile_intern_to_c(v, mpropdef, arguments) - else if mpropdef.is_extern then - if mpropdef.mproperty.is_init then - compile_externinit_to_c(v, mpropdef, arguments) - else - compile_externmeth_to_c(v, mpropdef, arguments) - end - else - abort + return end + + # We have a problem + var cn = v.class_name_string(arguments.first) + v.add("PRINT_ERROR(\"Runtime error: uncompiled method `%s` called on `%s`. NOT YET IMPLEMENTED\", \"{mpropdef.mproperty.name.escape_to_c}\", {cn});") + v.add_raw_abort end redef fun can_inline @@ -1919,7 +1930,7 @@ redef class AMethPropdef return false end - fun compile_intern_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) + fun compile_intern_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]): Bool do var pname = mpropdef.mproperty.name var cname = mpropdef.mclassdef.mclass.name @@ -1936,239 +1947,242 @@ redef class AMethPropdef if cname == "Int" then if pname == "output" then v.add("printf(\"%ld\\n\", {arguments.first});") - return + return true else if pname == "object_id" then v.ret(arguments.first) - return + return true else if pname == "+" then v.ret(v.new_expr("{arguments[0]} + {arguments[1]}", ret.as(not null))) - return + return true else if pname == "-" then v.ret(v.new_expr("{arguments[0]} - {arguments[1]}", ret.as(not null))) - return + return true else if pname == "unary -" then v.ret(v.new_expr("-{arguments[0]}", ret.as(not null))) - return + return true else if pname == "*" then v.ret(v.new_expr("{arguments[0]} * {arguments[1]}", ret.as(not null))) - return + return true else if pname == "/" then v.ret(v.new_expr("{arguments[0]} / {arguments[1]}", ret.as(not null))) - return + return true else if pname == "%" then v.ret(v.new_expr("{arguments[0]} % {arguments[1]}", ret.as(not null))) - return + return true else if pname == "lshift" then v.ret(v.new_expr("{arguments[0]} << {arguments[1]}", ret.as(not null))) - return + return true else if pname == "rshift" then v.ret(v.new_expr("{arguments[0]} >> {arguments[1]}", ret.as(not null))) - return + return true else if pname == "==" then v.ret(v.equal_test(arguments[0], arguments[1])) - return + return true else if pname == "!=" then var res = v.equal_test(arguments[0], arguments[1]) v.ret(v.new_expr("!{res}", ret.as(not null))) - return + return true else if pname == "<" then v.ret(v.new_expr("{arguments[0]} < {arguments[1]}", ret.as(not null))) - return + return true else if pname == ">" then v.ret(v.new_expr("{arguments[0]} > {arguments[1]}", ret.as(not null))) - return + return true else if pname == "<=" then v.ret(v.new_expr("{arguments[0]} <= {arguments[1]}", ret.as(not null))) - return + return true else if pname == ">=" then v.ret(v.new_expr("{arguments[0]} >= {arguments[1]}", ret.as(not null))) - return + return true else if pname == "to_f" then v.ret(v.new_expr("(double){arguments[0]}", ret.as(not null))) - return + return true else if pname == "ascii" then v.ret(v.new_expr("{arguments[0]}", ret.as(not null))) - return + return true end else if cname == "Char" then if pname == "output" then v.add("printf(\"%c\", {arguments.first});") - return + return true else if pname == "object_id" then v.ret(v.new_expr("(long){arguments.first}", ret.as(not null))) - return + return true else if pname == "successor" then v.ret(v.new_expr("{arguments[0]} + {arguments[1]}", ret.as(not null))) - return + return true else if pname == "predecessor" then v.ret(v.new_expr("{arguments[0]} - {arguments[1]}", ret.as(not null))) - return + return true else if pname == "==" then v.ret(v.equal_test(arguments[0], arguments[1])) - return + return true else if pname == "!=" then var res = v.equal_test(arguments[0], arguments[1]) v.ret(v.new_expr("!{res}", ret.as(not null))) - return + return true else if pname == "<" then v.ret(v.new_expr("{arguments[0]} < {arguments[1]}", ret.as(not null))) - return + return true else if pname == ">" then v.ret(v.new_expr("{arguments[0]} > {arguments[1]}", ret.as(not null))) - return + return true else if pname == "<=" then v.ret(v.new_expr("{arguments[0]} <= {arguments[1]}", ret.as(not null))) - return + return true else if pname == ">=" then v.ret(v.new_expr("{arguments[0]} >= {arguments[1]}", ret.as(not null))) - return + return true else if pname == "to_i" then v.ret(v.new_expr("{arguments[0]}-'0'", ret.as(not null))) - return + return true else if pname == "ascii" then v.ret(v.new_expr("(unsigned char){arguments[0]}", ret.as(not null))) - return + return true end else if cname == "Bool" then if pname == "output" then v.add("printf({arguments.first}?\"true\\n\":\"false\\n\");") - return + return true else if pname == "object_id" then v.ret(v.new_expr("(long){arguments.first}", ret.as(not null))) - return + return true else if pname == "==" then v.ret(v.equal_test(arguments[0], arguments[1])) - return + return true else if pname == "!=" then var res = v.equal_test(arguments[0], arguments[1]) v.ret(v.new_expr("!{res}", ret.as(not null))) - return + return true end else if cname == "Float" then if pname == "output" then v.add("printf(\"%f\\n\", {arguments.first});") - return + return true else if pname == "object_id" then v.ret(v.new_expr("(double){arguments.first}", ret.as(not null))) - return + return true else if pname == "+" then v.ret(v.new_expr("{arguments[0]} + {arguments[1]}", ret.as(not null))) - return + return true else if pname == "-" then v.ret(v.new_expr("{arguments[0]} - {arguments[1]}", ret.as(not null))) - return + return true else if pname == "unary -" then v.ret(v.new_expr("-{arguments[0]}", ret.as(not null))) - return + return true else if pname == "succ" then v.ret(v.new_expr("{arguments[0]}+1", ret.as(not null))) - return + return true else if pname == "prec" then v.ret(v.new_expr("{arguments[0]}-1", ret.as(not null))) - return + return true else if pname == "*" then v.ret(v.new_expr("{arguments[0]} * {arguments[1]}", ret.as(not null))) - return + return true else if pname == "/" then v.ret(v.new_expr("{arguments[0]} / {arguments[1]}", ret.as(not null))) - return + return true else if pname == "==" then v.ret(v.equal_test(arguments[0], arguments[1])) - return + return true else if pname == "!=" then var res = v.equal_test(arguments[0], arguments[1]) v.ret(v.new_expr("!{res}", ret.as(not null))) - return + return true else if pname == "<" then v.ret(v.new_expr("{arguments[0]} < {arguments[1]}", ret.as(not null))) - return + return true else if pname == ">" then v.ret(v.new_expr("{arguments[0]} > {arguments[1]}", ret.as(not null))) - return + return true else if pname == "<=" then v.ret(v.new_expr("{arguments[0]} <= {arguments[1]}", ret.as(not null))) - return + return true else if pname == ">=" then v.ret(v.new_expr("{arguments[0]} >= {arguments[1]}", ret.as(not null))) - return + return true else if pname == "to_i" then v.ret(v.new_expr("(long){arguments[0]}", ret.as(not null))) - return + return true end else if cname == "NativeString" then if pname == "[]" then v.ret(v.new_expr("{arguments[0]}[{arguments[1]}]", ret.as(not null))) - return + return true else if pname == "[]=" then v.add("{arguments[0]}[{arguments[1]}]={arguments[2]};") - return + return true else if pname == "copy_to" then v.add("memmove({arguments[1]}+{arguments[4]},{arguments[0]}+{arguments[3]},{arguments[2]});") - return + return true else if pname == "atoi" then v.ret(v.new_expr("atoi({arguments[0]});", ret.as(not null))) - return + return true else if pname == "init" then v.ret(v.new_expr("(char*)nit_alloc({arguments[1]})", ret.as(not null))) - return + return true end else if cname == "NativeArray" then v.native_array_def(pname, ret, arguments) - return + return true end if pname == "exit" then v.add("exit({arguments[1]});") - return + return true else if pname == "sys" then v.ret(v.new_expr("glob_sys", ret.as(not null))) - return + return true else if pname == "calloc_string" then v.ret(v.new_expr("(char*)nit_alloc({arguments[1]})", ret.as(not null))) - return + return true else if pname == "calloc_array" then v.calloc_array(ret.as(not null), arguments) - return + return true else if pname == "object_id" then v.ret(v.new_expr("(long){arguments.first}", ret.as(not null))) - return + return true else if pname == "is_same_type" then v.ret(v.is_same_type_test(arguments[0], arguments[1])) - return + return true else if pname == "is_same_instance" then v.ret(v.equal_test(arguments[0], arguments[1])) - return + return true else if pname == "output_class_name" then var nat = v.class_name_string(arguments.first) v.add("printf(\"%s\\n\", {nat});") - return + return true else if pname == "native_class_name" then var nat = v.class_name_string(arguments.first) v.ret(v.new_expr("(char*){nat}", ret.as(not null))) - return + return true else if pname == "force_garbage_collection" then v.add("nit_gcollect();") - return + return true else if pname == "native_argc" then v.ret(v.new_expr("glob_argc", ret.as(not null))) - return + return true else if pname == "native_argv" then v.ret(v.new_expr("glob_argv[{arguments[1]}]", ret.as(not null))) - return + return true end - v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED {class_name}:{mpropdef} at {location.to_s}\\n\");") - debug("Not implemented {mpropdef}") + return false end - fun compile_externmeth_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) + # Compile an extern method + # Return `true` if the compilation was successful, `false` if a fall-back is needed + fun compile_externmeth_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]): Bool do var externname - var nextern = self.n_extern - if nextern == null then - v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED nitni for {mpropdef} at {location.to_s}\\n\");") - v.add("show_backtrace(1);") - return + var at = self.get_single_annotation("extern", v.compiler.modelbuilder) + if at != null then + externname = at.arg_as_string(v.compiler.modelbuilder) + if externname == null then return false + else + var nextern = self.n_extern + if nextern == null then return false + externname = nextern.text.substring(1, nextern.text.length-2) end - externname = nextern.text.substring(1, nextern.text.length-2) if location.file != null then var file = location.file.filename v.add_extern(file) @@ -2189,18 +2203,23 @@ redef class AMethPropdef res = v.box_extern(res, ret.as(not null)) v.ret(res) end + return true end - fun compile_externinit_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) + # Compile an extern factory + # Return `true` if the compilation was successful, `false` if a fall-back is needed + fun compile_externinit_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]): Bool do var externname - var nextern = self.n_extern - if nextern == null then - v.add("PRINT_ERROR(\"NOT YET IMPLEMENTED nitni for {mpropdef} at {location.to_s}\\n\");") - v.add("show_backtrace(1);") - return + var at = self.get_single_annotation("extern", v.compiler.modelbuilder) + if at != null then + externname = at.arg_as_string(v.compiler.modelbuilder) + if externname == null then return false + else + var nextern = self.n_extern + if nextern == null then return false + externname = nextern.text.substring(1, nextern.text.length-2) end - externname = nextern.text.substring(1, nextern.text.length-2) if location.file != null then var file = location.file.filename v.add_extern(file) @@ -2215,6 +2234,7 @@ redef class AMethPropdef v.add("{res} = {externname}({arguments.join(", ")});") res = v.box_extern(res, ret) v.ret(res) + return true end end @@ -3053,4 +3073,3 @@ for mmodule in mmodules do end toolcontext.run_global_phases(ms) end - diff --git a/src/android_annotations.nit b/src/compiler/android_annotations.nit similarity index 98% rename from src/android_annotations.nit rename to src/compiler/android_annotations.nit index ec0d2dc..a6fc4e2 100644 --- a/src/android_annotations.nit +++ b/src/compiler/android_annotations.nit @@ -18,11 +18,10 @@ # by calling `ModelBuilder::android_project_for`. module android_annotations -import parser_util -import modelbuilder -import modelize_property +private import parser_util +import modelize import literal -import typing +import semantize private import annotation # Metadata associated to an Android project @@ -137,7 +136,7 @@ redef class AAnnotation else for arg in args do var format_error = "Annotation error: \"{name}\" expects its arguments to be of type Int or a call to `git_revision`" - + var value value = arg.as_int if value != null then diff --git a/src/android_platform.nit b/src/compiler/android_platform.nit similarity index 99% rename from src/android_platform.nit rename to src/compiler/android_platform.nit index 8532cf8..c06a374 100644 --- a/src/android_platform.nit +++ b/src/compiler/android_platform.nit @@ -1,3 +1,4 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). # # Copyright 2014 Alexis LaferriÃ¨re # diff --git a/src/coloring.nit b/src/compiler/coloring.nit similarity index 99% rename from src/coloring.nit rename to src/compiler/coloring.nit index aa65f32..ed9b466 100644 --- a/src/coloring.nit +++ b/src/compiler/coloring.nit @@ -386,5 +386,3 @@ class POSetBucketsColorer[H: Object, E: Object] return true end end - - diff --git a/src/compiler/compiler.nit b/src/compiler/compiler.nit new file mode 100644 index 0000000..902a656 --- /dev/null +++ b/src/compiler/compiler.nit @@ -0,0 +1,24 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). +# +# 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. + +# Compilation to C +module compiler + +import separate_erasure_compiler +import global_compiler +import compiler_ffi + +import android_platform +import pnacl_platform +import emscripten_platform diff --git a/src/compiler_ffi.nit b/src/compiler/compiler_ffi.nit similarity index 98% rename from src/compiler_ffi.nit rename to src/compiler/compiler_ffi.nit index 4c55f65..331955e 100644 --- a/src/compiler_ffi.nit +++ b/src/compiler/compiler_ffi.nit @@ -110,8 +110,6 @@ redef class AMethPropdef amodule.ensure_compile_ffi_wrapper compile_ffi_method(mmodule) - assert self isa AExternPropdef - # nitni - Compile missing callbacks mmodule.ensure_compile_nitni_base(v) var ccu = mmodule.nitni_ccu.as(not null) @@ -144,15 +142,10 @@ redef class AMethPropdef redef fun compile_externmeth_to_c(v, mpropdef, arguments) do - var mmodule = mpropdef.mclassdef.mmodule - # if using the old native interface fallback on previous implementation - var nextern = self.n_extern - if nextern != null then - super - return - end + if n_extern_code_block == null then return super + var mmodule = mpropdef.mclassdef.mmodule mmodule.uses_ffi = true var mclass_type = mpropdef.mclassdef.bound_mtype @@ -205,19 +198,15 @@ redef class AMethPropdef end compile_ffi_support_to_c(v) + return true end redef fun compile_externinit_to_c(v, mpropdef, arguments) do - var mmodule = mpropdef.mclassdef.mmodule - # if using the old native interface fallback on previous implementation - var nextern = self.n_extern - if nextern != null then - super - return - end + if n_extern_code_block == null then return super + var mmodule = mpropdef.mclassdef.mmodule mmodule.uses_ffi = true var mclass_type = mpropdef.mclassdef.bound_mtype @@ -259,6 +248,7 @@ redef class AMethPropdef v.ret(recv_var) compile_ffi_support_to_c(v) + return true end end @@ -346,7 +336,7 @@ redef class MNullableType var base_cname = "null_{mtype.mangled_cname}" var full_cname = "NIT_NULL___{base_cname}" - # In nitni files, declare internal function as extern + # In nitni files, declare internal function as extern var full_friendly_csignature = "{cname_blind} {full_cname}()" ccu.header_decl.add("extern {full_friendly_csignature};\n") @@ -378,7 +368,7 @@ redef class MExplicitCall var mproperty = mproperty assert mproperty isa MMethod - # In nitni files, declare internal function as extern + # In nitni files, declare internal function as extern var full_friendly_csignature = mproperty.build_csignature(recv_mtype, v.compiler.mainmodule, null, long_signature, internal_call_context) ccu.header_decl.add("extern {full_friendly_csignature};\n") @@ -496,7 +486,7 @@ redef class MExplicitCast ## check type # - # In nitni files, declare internal function as extern + # In nitni files, declare internal function as extern var full_friendly_csignature = "int {v.compiler.mainmodule.name }___{from.mangled_cname}_is_a_{to.mangled_cname}({from.cname_blind})" ccu.header_decl.add("extern {full_friendly_csignature};\n") diff --git a/src/emscripten_platform.nit b/src/compiler/emscripten_platform.nit similarity index 100% rename from src/emscripten_platform.nit rename to src/compiler/emscripten_platform.nit diff --git a/src/global_compiler.nit b/src/compiler/global_compiler.nit similarity index 100% rename from src/global_compiler.nit rename to src/compiler/global_compiler.nit diff --git a/src/pnacl_platform.nit b/src/compiler/pnacl_platform.nit similarity index 100% rename from src/pnacl_platform.nit rename to src/compiler/pnacl_platform.nit diff --git a/src/separate_compiler.nit b/src/compiler/separate_compiler.nit similarity index 100% rename from src/separate_compiler.nit rename to src/compiler/separate_compiler.nit diff --git a/src/separate_erasure_compiler.nit b/src/compiler/separate_erasure_compiler.nit similarity index 100% rename from src/separate_erasure_compiler.nit rename to src/compiler/separate_erasure_compiler.nit diff --git a/src/doc/doc_model.nit b/src/doc/doc_model.nit index 9080dbf..01b7bc7 100644 --- a/src/doc/doc_model.nit +++ b/src/doc/doc_model.nit @@ -54,7 +54,7 @@ redef class MEntity # URL of this entity Nitdoc page fun nitdoc_url: String is abstract - # A template link to the mentity `nitdoc_anchor` + # A template link to the mentity `nitdoc_id` fun tpl_anchor: TplLink do var tpl = new TplLink("#{nitdoc_id}", nitdoc_name) if mdoc != null then @@ -186,7 +186,7 @@ redef class MGroup return "{mproject.nitdoc_id}__{nitdoc_name}" end - redef fun nitdoc_url do return "group_{name}.html" + redef fun nitdoc_url do return "group_{nitdoc_id}.html" redef fun tpl_namespace do var tpl = new Template @@ -229,16 +229,7 @@ redef class MModule return nitdoc_name end - redef fun nitdoc_url do - var res = new FlatBuffer - res.append("module_") - var mowner = public_owner - if mowner != null then - res.append("{public_owner.name}_") - end - res.append("{self.name}.html") - return res.to_s - end + redef fun nitdoc_url do return "module_{nitdoc_id}.html" redef fun tpl_declaration do var tpl = new Template @@ -272,8 +263,7 @@ end redef class MClass redef fun nitdoc_name do return name.html_escape redef fun nitdoc_id do return "{intro_mmodule.mgroup.mproject}__{name.to_cmangle}" - redef fun nitdoc_url do return "class_{public_owner}_{name}.html" - + redef fun nitdoc_url do return "class_{nitdoc_id}.html" redef fun mdoc do return intro.mdoc redef fun tpl_declaration do return intro.tpl_declaration @@ -439,7 +429,7 @@ end redef class MProperty redef fun nitdoc_name do return name.html_escape redef fun nitdoc_id do return "{intro_mclassdef.mclass.nitdoc_id}__{name.to_cmangle}" - redef fun nitdoc_url do return "proprety_{nitdoc_id}.html" + redef fun nitdoc_url do return "property_{nitdoc_id}.html" redef fun mdoc do return intro.mdoc diff --git a/src/doc/doc_pages.nit b/src/doc/doc_pages.nit index a49b76d..9c38d44 100644 --- a/src/doc/doc_pages.nit +++ b/src/doc/doc_pages.nit @@ -135,20 +135,20 @@ class Nitdoc end private fun overview do - var overviewpage = new NitdocOverview(ctx, model, mainmodule) - overviewpage.render.write_to_file("{ctx.output_dir.to_s}/index.html") + var page = new NitdocOverview(ctx, model, mainmodule) + page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}") end private fun search do - var searchpage = new NitdocSearch(ctx, model, mainmodule) - searchpage.render.write_to_file("{ctx.output_dir.to_s}/search.html") + var page = new NitdocSearch(ctx, model, mainmodule) + page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}") end private fun groups do for mproject in model.mprojects do for mgroup in mproject.mgroups.to_a do var page = new NitdocGroup(ctx, model, mainmodule, mgroup) - page.render.write_to_file("{ctx.output_dir.to_s}/{mgroup.nitdoc_url}") + page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}") end end end @@ -156,22 +156,22 @@ class Nitdoc private fun modules do for mmodule in model.mmodules do if mmodule.is_fictive then continue - var modulepage = new NitdocModule(ctx, model, mainmodule, mmodule) - modulepage.render.write_to_file("{ctx.output_dir.to_s}/{mmodule.nitdoc_url}") + var page = new NitdocModule(ctx, model, mainmodule, mmodule) + page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}") end end private fun classes do for mclass in model.mclasses do - var classpage = new NitdocClass(ctx, model, mainmodule, mclass) - classpage.render.write_to_file("{ctx.output_dir.to_s}/{mclass.nitdoc_url}") + var page = new NitdocClass(ctx, model, mainmodule, mclass) + page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}") end end private fun properties do for mproperty in model.mproperties do var page = new NitdocProperty(ctx, model, mainmodule, mproperty) - page.render.write_to_file("{ctx.output_dir.to_s}/{mproperty.nitdoc_url}") + page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}") end end @@ -265,6 +265,7 @@ abstract class NitdocPage # build page var tpl = tpl_page tpl.title = tpl_title + tpl.url = page_url tpl.shareurl = shareurl tpl.topmenu = tpl_topmenu tpl_content @@ -281,6 +282,9 @@ abstract class NitdocPage return tpl end + # URL to this page. + fun page_url: String is abstract + # Build page template fun tpl_page: TplPage is abstract @@ -297,7 +301,7 @@ abstract class NitdocPage # Build top menu template fun tpl_topmenu: TplTopMenu do - var topmenu = new TplTopMenu + var topmenu = new TplTopMenu(page_url) var brand = ctx.opt_custom_brand.value if brand != null then var tpl = new Template @@ -306,6 +310,8 @@ abstract class NitdocPage tpl.add "" topmenu.brand = tpl end + topmenu.add_link new TplLink("index.html", "Overview") + topmenu.add_link new TplLink("search.html", "Index") return topmenu end @@ -344,7 +350,7 @@ abstract class NitdocPage do if location == null then return null var source = ctx.opt_source.value - if source == null then return "{location.file.filename.simplify_path}" + if source == null then return location.file.filename.simplify_path # THIS IS JUST UGLY ! (but there is no replace yet) var x = source.split_with("%f") source = x.join(location.file.filename.simplify_path) @@ -382,26 +388,30 @@ abstract class NitdocPage article.content = mmodule.tpl_definition # mclassdefs list var intros = mmodule.intro_mclassdefs(ctx.min_visibility).to_a - mainmodule.linearize_mclassdefs(intros) - var intros_art = new TplArticle.with_title("{mmodule.nitdoc_id}_intros", "Introduces") - var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"]) - for mclassdef in intros do - intros_lst.add_li new TplListItem.with_content(mclassdef.tpl_list_item) - end - if not intros_lst.is_empty then - intros_art.content = intros_lst - article.add_child intros_art + if not intros.is_empty then + mainmodule.linearize_mclassdefs(intros) + var intros_art = new TplArticle.with_title("{mmodule.nitdoc_id}_intros", "Introduces") + var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"]) + for mclassdef in intros do + intros_lst.add_li mclassdef.tpl_list_item + end + if not intros_lst.is_empty then + intros_art.content = intros_lst + article.add_child intros_art + end end var redefs = mmodule.redef_mclassdefs(ctx.min_visibility).to_a - mainmodule.linearize_mclassdefs(redefs) - var redefs_art = new TplArticle.with_title("{mmodule.nitdoc_id}_redefs", "Redefines") - var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"]) - for mclassdef in redefs do - redefs_lst.add_li new TplListItem.with_content(mclassdef.tpl_list_item) - end - if not redefs_lst.is_empty then - redefs_art.content = redefs_lst - article.add_child redefs_art + if not redefs.is_empty then + mainmodule.linearize_mclassdefs(redefs) + var redefs_art = new TplArticle.with_title("{mmodule.nitdoc_id}_redefs", "Redefines") + var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"]) + for mclassdef in redefs do + redefs_lst.add_li mclassdef.tpl_list_item + end + if not redefs_lst.is_empty then + redefs_art.content = redefs_lst + article.add_child redefs_art + end end return article end @@ -425,7 +435,7 @@ abstract class NitdocPage var intros = new TplArticle.with_title("{mclassdef.nitdoc_id}_intros", "Introduces") var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"]) for mpropdef in mclassdef.collect_intro_mpropdefs(ctx.min_visibility) do - intros_lst.add_li new TplListItem.with_content(mpropdef.tpl_list_item) + intros_lst.add_li mpropdef.tpl_list_item end if not intros_lst.is_empty then intros.content = intros_lst @@ -434,7 +444,7 @@ abstract class NitdocPage var redefs = new TplArticle.with_title("{mclassdef.nitdoc_id}_redefs", "Redefines") var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"]) for mpropdef in mclassdef.collect_redef_mpropdefs(ctx.min_visibility) do - redefs_lst.add_li new TplListItem.with_content(mpropdef.tpl_list_item) + redefs_lst.add_li mpropdef.tpl_list_item end if not redefs_lst.is_empty then redefs.content = redefs_lst @@ -499,12 +509,7 @@ class NitdocOverview end end - redef fun tpl_topmenu do - var topmenu = super - topmenu.add_item(new TplLink("#", "Overview"), true) - topmenu.add_item(new TplLink("search.html", "Index"), false) - return topmenu - end + redef fun page_url do return "index.html" # intro text private fun tpl_intro: TplSection do @@ -547,12 +552,7 @@ class NitdocSearch redef fun tpl_title do return "Index" - redef fun tpl_topmenu do - var topmenu = super - topmenu.add_item(new TplLink("index.html", "Overview"), false) - topmenu.add_item(new TplLink("#", "Index"), true) - return topmenu - end + redef fun page_url do return "search.html" redef fun tpl_content do var tpl = new TplSearchPage("search_all") @@ -646,19 +646,17 @@ class NitdocGroup private var sidebar = new TplSidebar redef fun tpl_sidebar do return sidebar - redef fun tpl_title do return "{mgroup.nitdoc_name}" + redef fun tpl_title do return mgroup.nitdoc_name + + redef fun page_url do return mgroup.nitdoc_url redef fun tpl_topmenu do var topmenu = super var mproject = mgroup.mproject - topmenu.add_item(new TplLink("index.html", "Overview"), false) - if mgroup.is_root then - topmenu.add_item(new TplLink("#", "{mproject.nitdoc_name}"), true) - else - topmenu.add_item(new TplLink(mproject.nitdoc_url, "{mproject.nitdoc_name}"), false) - topmenu.add_item(new TplLink("#", "{mgroup.nitdoc_name}"), true) + if not mgroup.is_root then + topmenu.add_link new TplLink(mproject.nitdoc_url, mproject.nitdoc_name) end - topmenu.add_item(new TplLink("search.html", "Index"), false) + topmenu.add_link new TplLink(page_url, mproject.nitdoc_name) return topmenu end @@ -678,7 +676,7 @@ class NitdocGroup tpl_sidebar.boxes.add new TplSideBox.with_content("All classes", list) end - private fun tpl_sidebar_item(def: MClass): Template do + private fun tpl_sidebar_item(def: MClass): TplListItem do var classes = def.intro.tpl_css_classes.to_a if intros.has(def) then classes.add "intro" @@ -688,7 +686,7 @@ class NitdocGroup var lnk = new Template lnk.add new TplLabel.with_classes(classes) lnk.add def.tpl_link - return lnk + return new TplListItem.with_content(lnk) end # intro text @@ -781,15 +779,14 @@ class NitdocModule private var sidebar = new TplSidebar redef fun tpl_sidebar do return sidebar - redef fun tpl_title do return "{mmodule.nitdoc_name}" + redef fun tpl_title do return mmodule.nitdoc_name + redef fun page_url do return mmodule.nitdoc_url redef fun tpl_topmenu do var topmenu = super var mproject = mmodule.mgroup.mproject - topmenu.add_item(new TplLink("index.html", "Overview"), false) - topmenu.add_item(new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}"), false) - topmenu.add_item(new TplLink("#", "{mmodule.nitdoc_name}"), true) - topmenu.add_item(new TplLink("search.html", "Index"), false) + topmenu.add_link new TplLink(mproject.nitdoc_url, mproject.nitdoc_name) + topmenu.add_link new TplLink(page_url, mmodule.nitdoc_name) return topmenu end @@ -809,7 +806,7 @@ class NitdocModule tpl_sidebar.boxes.add new TplSideBox.with_content("All classes", list) end - private fun tpl_sidebar_item(def: MClass): Template do + private fun tpl_sidebar_item(def: MClass): TplListItem do var classes = def.intro.tpl_css_classes.to_a if def.intro_mmodule == mmodule then classes.add "intro" @@ -819,7 +816,7 @@ class NitdocModule var lnk = new Template lnk.add new TplLabel.with_classes(classes) lnk.add def.tpl_link - return lnk + return new TplListItem.with_content(lnk) end # intro text @@ -1018,14 +1015,13 @@ class NitdocClass redef fun tpl_sidebar do return sidebar redef fun tpl_title do return "{mclass.nitdoc_name}{mclass.tpl_signature.write_to_string}" + redef fun page_url do return mclass.nitdoc_url redef fun tpl_topmenu do var topmenu = super var mproject = mclass.intro_mmodule.mgroup.mproject - topmenu.add_item(new TplLink("index.html", "Overview"), false) - topmenu.add_item(new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}"), false) - topmenu.add_item(new TplLink("#", "{mclass.nitdoc_name}"), true) - topmenu.add_item(new TplLink("search.html", "Index"), false) + topmenu.add_link new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}") + topmenu.add_link new TplLink(page_url, mclass.nitdoc_name) return topmenu end @@ -1052,14 +1048,14 @@ class NitdocClass summary.elts.add entry end - private fun tpl_sidebar_item(mprop: MProperty): Template do + private fun tpl_sidebar_item(mprop: MProperty): TplListItem do var classes = mprop.intro.tpl_css_classes.to_a if not mprops2mdefs.has_key(mprop) then classes.add "inherit" var lnk = new Template lnk.add new TplLabel.with_classes(classes) lnk.add mprop.intro.tpl_link - return lnk + return new TplListItem.with_content(lnk) end var defs = mprops2mdefs[mprop] if defs.has(mprop.intro) then @@ -1070,7 +1066,7 @@ class NitdocClass var lnk = new Template lnk.add new TplLabel.with_classes(classes) lnk.add mprop.intro.tpl_anchor - return lnk + return new TplListItem.with_content(lnk) end private fun tpl_intro: TplSection do @@ -1302,17 +1298,6 @@ class NitdocClass return res end - private fun sort_by_public_owner(mmodules: Collection[MModule]): Map[MModule, Set[MModule]] do - var map = new HashMap[MModule, Set[MModule]] - for mmodule in mmodules do - var owner = mmodule - if mmodule.public_owner != null then owner = mmodule.public_owner.as(not null) - if not map.has_key(owner) then map[owner] = new HashSet[MModule] - map[owner].add mmodule - end - return map - end - # Generate dot hierarchy for classes fun tpl_dot(mclasses: Collection[MClass]): nullable TplArticle do var poset = new POSet[MClass] @@ -1379,16 +1364,16 @@ class NitdocProperty return "{mproperty.nitdoc_name}{mproperty.tpl_signature.write_to_string}" end + redef fun page_url do return mproperty.nitdoc_url + redef fun tpl_topmenu do var topmenu = super var mmodule = mproperty.intro_mclassdef.mmodule var mproject = mmodule.mgroup.mproject var mclass = mproperty.intro_mclassdef.mclass - topmenu.add_item(new TplLink("index.html", "Overview"), false) - topmenu.add_item(new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}"), false) - topmenu.add_item(new TplLink("{mclass.nitdoc_url}", "{mclass.nitdoc_name}"), false) - topmenu.add_item(new TplLink("#", "{mproperty.nitdoc_name}"), true) - topmenu.add_item(new TplLink("search.html", "Index"), false) + topmenu.add_link new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}") + topmenu.add_link new TplLink("{mclass.nitdoc_url}", "{mclass.nitdoc_name}") + topmenu.add_link new TplLink(page_url, mproperty.nitdoc_name) return topmenu end diff --git a/src/doc/doc_templates.nit b/src/doc/doc_templates.nit index 7650feb..1d1fb45 100644 --- a/src/doc/doc_templates.nit +++ b/src/doc/doc_templates.nit @@ -25,6 +25,9 @@ class TplPage # Page title in HTML header var title: String is writable, noinit + # Page url + var url: String is writable, noinit + # Directory where css, js and other assets can be found var shareurl: String is writable, noinit @@ -105,7 +108,7 @@ class TplPage add "" add "" add "" - add "" for script in scripts do add script add """

BiÃ¨res

This is a H1

This is a H2

This is a H1

This is a H2

This is a H6

This is a H1

This is a H2

This is a H3

This is a header.

Unordered

Ordered

Nested

{{{title}}}

""" + add message + add "