Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typo improvements for CH. 1 #29

Merged
merged 4 commits into from
Mar 6, 2018
Merged

typo improvements for CH. 1 #29

merged 4 commits into from
Mar 6, 2018

Conversation

davidcok
Copy link
Contributor

@davidcok davidcok commented Mar 1, 2018

Miscellaneous phrasing improvements to Sulfur Foreword & Ch. 1.

Copy link
Member

@vprevosto vprevosto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waiting for @davidcok feedback

intro_modern.tex Outdated
in \lstinline|//@| comments are alike.

in \lstinline|//@| comments are similar.
\marginpar{Somewhere it needs to be defined in what way ACSL specifications can be split across consecutive \lstinline|//@| comments, if they can be split at all. For example, JML requires each function contract clause to be completely within an annotation.}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current implementation in Frama-C even requires the entire contract to be in the same comment. I'll propose something in this regard.

@@ -8,6 +8,11 @@ @Misc{ESCJava2
note = {\url{http://kind.ucd.ie/products/opensource/ESCJava2/}}
}

@Misc{OpenJML,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidcok you didn't provide a reference for OpenJML. Is the site OK or do you prefer the OpenJML article mentioned there?

or more occurrences of $e$, $e^+$ for repetition of one or more
occurrences of $e$, and $e^?$ for zero or one occurrence of $e$. For
the sake of simplicity, we only describe annotations in the usual
\lstinline|/*@ ... */| style of comments. One-line annotations
in \lstinline|//@| comments are alike.

in \lstinline|//@| comments are similar. Note however that two consecutive
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidcok does it answer your remark?

@davidcok
Copy link
Contributor Author

davidcok commented Mar 2, 2018 via email

@davidcok
Copy link
Contributor Author

davidcok commented Mar 2, 2018 via email

@vprevosto
Copy link
Member

Regarding annotations: so must an entire function contract be in one annotation comment? What about multiple loop invariants?

A function contract must indeed be in one annotation comment. It's the same thing for loop annotations: there can only be a single one for each loop, and it must encompass all loop invariants and loop assigns related to the loop.

Regarding bibliography - I added some references in the jmlupdate branch

OK, thanks

By the way, It seems that you made your comment by replying to the notification email you received, but I'm under the impression that github.com and your mailer do not cooperate very well, which makes your comment slightly difficult to read.

@vprevosto
Copy link
Member

(forgot to answer this remark, sorry)

Regarding contracts and extent of comments - we should distinguish what the langue states and what the current implementation requires, if we decide they should be different.

Even though it was never explicitly mentioned, the fact that an ACSL annotation should fit entirely in a single comment has always been taken for granted. I'd suggest to keep the new clarification. If someone ever claims that they absolutely need to be able to split a contract/loop annotation into several comment, we might revise this option (of course, this person can be you 😁).

@vprevosto vprevosto merged commit 24c9a37 into master Mar 6, 2018
@pbaudin pbaudin deleted the typos branch January 4, 2019 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants