Skip to content

Commit

Permalink
Rascal Tutor: adjusting the directory structure due to renaming previ…
Browse files Browse the repository at this point in the history 
…ous misspellings
  • Loading branch information
@grammarware
grammarware committed Jun 20, 2012
1 parent 480dd82 commit 033793e
Show file tree
Hide file tree
Showing 13 changed files with 72 additions and 73 deletions.
2 changes: 1 addition & 1 deletion ...lTutor/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Disambiguation.concept
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ There are generally three ways of removing ambiguity from parse forests that are
** [$Disambiguation/Priority] declarations, which can be used to define the relative priority in expression languages
** [$Disambiguation/Associativity] declarations, which can be used to define relative associativity between operators of expression languages
** [Follow] declarations, which can be used to implement longest match using lookahead
** [Preceed] declarations, which can be used to implement first match using look behind
** [Precede] declarations, which can be used to implement first match using look behind
** [Reserve] declarations, which allow you to finite sets of strings from a [SyntaxDefinition] to implement keyword reservation
# The second way is to add [Action]s that will be triggered just after parsing and allow you to trim a parse forest using any information necessary.
# The third way is use the [Visit] statement on a parse tree and implement your own filter post-parsing time, or any other kind of program that processes [ParseTrees].
Expand Down
4 changes: 2 additions & 2 deletions ...scalTutor/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Disambiguation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@


<div id="Details">
<span class="sectionHead">Details</span> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Associativity/Associativity.html">Associativity</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Follow/Follow.html">Follow</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed/Preceed.html">Preceed</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Priority/Priority.html">Priority</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Reserve/Reserve.html">Reserve</a> &#032
<span class="sectionHead">Details</span> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Associativity/Associativity.html">Associativity</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Follow/Follow.html">Follow</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede/Precede.html">Precede</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed/Preceed.html">Preceed</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Priority/Priority.html">Priority</a> &#032 <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Reserve/Reserve.html">Reserve</a> &#032
</div>

<div id="Description">
<span class="sectionHead">Description</span> There are generally three ways of removing ambiguity from parse forests that are produced by parsers generated from <a href="/Courses/Rascal/Declarations/SyntaxDefinition/SyntaxDefinition.html">SyntaxDefinition</a>s.
<ol><li> The first way is to add disambiguation declarations to the <a href="/Courses/Rascal/Declarations/SyntaxDefinition/SyntaxDefinition.html">SyntaxDefinition</a>. You can choose from: <ul><li> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Priority/Priority.html">Priority</a> declarations, which can be used to define the relative priority in expression languages</li>
<li> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Associativity/Associativity.html">Associativity</a> declarations, which can be used to define relative associativity between operators of expression languages</li>
<li> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Follow/Follow.html">Follow</a> declarations, which can be used to implement longest match using lookahead</li>
<li> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed/Preceed.html">Preceed</a> declarations, which can be used to implement first match using look behind</li>
<li> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede/Precede.html">Precede</a> declarations, which can be used to implement first match using look behind</li>
<li> <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Reserve/Reserve.html">Reserve</a> declarations, which allow you to finite sets of strings from a <a href="/Courses/Rascal/Declarations/SyntaxDefinition/SyntaxDefinition.html">SyntaxDefinition</a> to implement keyword reservation</li>
</ul></li>
<li> The second way is to add <a href="/Courses/Rascal/Declarations/SyntaxDefinition/Action/Action.html">Action</a>s that will be triggered just after parsing and allow you to trim a parse forest using any information necessary.</li>
Expand Down
2 changes: 1 addition & 1 deletion ...on/Disambiguation/Preceed/Preceed.concept → ...on/Disambiguation/Precede/Precede.concept
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: Preceed
Name: Precede

Synopsis:

Expand Down
14 changes: 7 additions & 7 deletions ...ition/Disambiguation/Preceed/Preceed.html → ...ition/Disambiguation/Precede/Precede.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@


<head>
<title>Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed</title>
<title>Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede</title>

<meta name="description" content="Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed: ">
<meta name="description" content="Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede: ">

<meta name="keywords" content="Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed, Rascal, meta-programming, software analysis, software transformation">
<meta name="keywords" content="Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede, Rascal, meta-programming, software analysis, software transformation">
<link type="text/css" rel="stylesheet" href="/Courses/prelude.css"/>
<link type="text/css" rel="stylesheet" href="/Courses/jquery.autocomplete.css"/>
<script type="text/javascript" src="/Courses/jquery-1.4.2.min.js"></script>
Expand All @@ -29,7 +29,7 @@
<div id="searchBox">
<form method="GET" id="searchForm" action="/search">
<img id="searchIcon" height="20" width="20" src="/Courses/images/magnify.png">
<input type="hidden" name="concept" value="Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed">
<input type="hidden" name="concept" value="Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede">
<input type="text" id="searchField" name="term" autocomplete="off"><br />
<div id="popups"></div>
</form>
Expand All @@ -40,7 +40,7 @@
<div id="conceptPane">

<div id="Name">
<span class="sectionHead">Name</span> <a href="/Courses/Rascal/Rascal.html">Rascal</a>/<a href="/Courses/Rascal/Declarations/Declarations.html">Declarations</a>/<a href="/Courses/Rascal/Declarations/SyntaxDefinition/SyntaxDefinition.html">SyntaxDefinition</a>/<a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Disambiguation.html">Disambiguation</a>/<a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed/Preceed.html">Preceed</a>
<span class="sectionHead">Name</span> <a href="/Courses/Rascal/Rascal.html">Rascal</a>/<a href="/Courses/Rascal/Declarations/Declarations.html">Declarations</a>/<a href="/Courses/Rascal/Declarations/SyntaxDefinition/SyntaxDefinition.html">SyntaxDefinition</a>/<a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Disambiguation.html">Disambiguation</a>/<a href="/Courses/Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede/Precede.html">Precede</a>
</div>


Expand All @@ -67,8 +67,8 @@



<a id="tutorAction" href="/Courses/index.html"><img id="leftIcon" height="40" width="40" src="/Courses/images/rascal-tutor-small.png"></a><div id="editMenu">[<a id="editAction" href="/edit?concept=Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed&new=false"><b>Edit</b></a>] |
[<a id="newAction" href="/edit?concept=Rascal/Declarations/SyntaxDefinition/Disambiguation/Preceed&new=true"><b>New Subconcept</b></a>] |
<a id="tutorAction" href="/Courses/index.html"><img id="leftIcon" height="40" width="40" src="/Courses/images/rascal-tutor-small.png"></a><div id="editMenu">[<a id="editAction" href="/edit?concept=Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede&new=false"><b>Edit</b></a>] |
[<a id="newAction" href="/edit?concept=Rascal/Declarations/SyntaxDefinition/Disambiguation/Precede&new=true"><b>New Subconcept</b></a>] |
[<a id="compileAction" href="/compile?name=Rascal"><b>Recompile Course</b></a>] |
[<a id="warnAction" href="/Courses/Rascal/warnings.html"><b>Warnings</b></a>]</div>
<span class="editMenuFooter">Is this page unclear, or have you spotted an error? Please add a comment below and help us to improve it. For all other questions and remarks, visit <a href="http://ask.rascal-mpl.org">ask.rascal-mpl.org</a>. </span>
Expand Down
6 changes: 3 additions & 3 deletions ...rthesianProduct/CarthesianProduct.concept → ...CartesianProduct/CartesianProduct.concept
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: CarthesianProduct
Name: CartesianProduct

Synopsis: Carthesian product of two relation values.
Synopsis: Cartesian product of two relation values.

Syntax:
`$Exp_1$ * $Exp_2$`
Expand All @@ -15,7 +15,7 @@ Function:
Details:

Description:
Returns a binary relation that is the Carthesian product of two sets.
Returns a binary relation that is the [Cartesian product](http://en.wikipedia.org/wiki/Cartesian_product) of two sets.

Examples:
<screen>
Expand Down
50 changes: 25 additions & 25 deletions .../CarthesianProduct/CarthesianProduct.html → ...on/CartesianProduct/CartesianProduct.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@


<head>
<title>Rascal/Expressions/Values/Relation/CarthesianProduct</title>
<title>Rascal/Expressions/Values/Relation/CartesianProduct</title>

<meta name="description" content="Rascal/Expressions/Values/Relation/CarthesianProduct: Carthesian product of two relation values.">
<meta name="description" content="Rascal/Expressions/Values/Relation/CartesianProduct: Cartesian product of two relation values.">

<meta name="keywords" content="Rascal/Expressions/Values/Relation/CarthesianProduct, Rascal, meta-programming, software analysis, software transformation">
<meta name="keywords" content="Rascal/Expressions/Values/Relation/CartesianProduct, Rascal, meta-programming, software analysis, software transformation">
<link type="text/css" rel="stylesheet" href="/Courses/prelude.css"/>
<link type="text/css" rel="stylesheet" href="/Courses/jquery.autocomplete.css"/>
<script type="text/javascript" src="/Courses/jquery-1.4.2.min.js"></script>
Expand All @@ -29,7 +29,7 @@
<div id="searchBox">
<form method="GET" id="searchForm" action="/search">
<img id="searchIcon" height="20" width="20" src="/Courses/images/magnify.png">
<input type="hidden" name="concept" value="Rascal/Expressions/Values/Relation/CarthesianProduct">
<input type="hidden" name="concept" value="Rascal/Expressions/Values/Relation/CartesianProduct">
<input type="text" id="searchField" name="term" autocomplete="off"><br />
<div id="popups"></div>
</form>
Expand All @@ -40,11 +40,11 @@
<div id="conceptPane">

<div id="Name">
<span class="sectionHead">Name</span> <a href="/Courses/Rascal/Rascal.html">Rascal</a>/<a href="/Courses/Rascal/Expressions/Expressions.html">Expressions</a>/<a href="/Courses/Rascal/Expressions/Values/Values.html">Values</a>/<a href="/Courses/Rascal/Expressions/Values/Relation/Relation.html">Relation</a>/<a href="/Courses/Rascal/Expressions/Values/Relation/CarthesianProduct/CarthesianProduct.html">CarthesianProduct</a>
<span class="sectionHead">Name</span> <a href="/Courses/Rascal/Rascal.html">Rascal</a>/<a href="/Courses/Rascal/Expressions/Expressions.html">Expressions</a>/<a href="/Courses/Rascal/Expressions/Values/Values.html">Values</a>/<a href="/Courses/Rascal/Expressions/Values/Relation/Relation.html">Relation</a>/<a href="/Courses/Rascal/Expressions/Values/Relation/CartesianProduct/CartesianProduct.html">CartesianProduct</a>
</div>

<div id="Synopsis">
<span class="sectionHead">Synopsis</span> Carthesian product of two relation values.
<span class="sectionHead">Synopsis</span> Cartesian product of two relation values.

</div>

Expand All @@ -62,7 +62,7 @@


<div id="Description">
<span class="sectionHead">Description</span> Returns a binary relation that is the Carthesian product of two sets.
<span class="sectionHead">Description</span> Returns a binary relation that is the <a href="http://en.wikipedia.org/wiki/Cartesian_product">Cartesian product<img src="/Courses/images/www-icon.png" with="20" height="20"></a> of two sets.

</div>

Expand Down Expand Up @@ -97,51 +97,51 @@
<span class="sectionHead">Questions</span> <br/>


<div id="Rascal_Expressions_Values_Relation_CarthesianProduct_1" class="question">
<div id="Rascal_Expressions_Values_Relation_CartesianProduct_1" class="question">
<b>Question [1]. </b>
<span id="good_Rascal_Expressions_Values_Relation_CarthesianProduct_1" class="answerStatus">
<span id="good_Rascal_Expressions_Values_Relation_CartesianProduct_1" class="answerStatus">
<img height="25" width="25" src="/Courses/images/good.png"/>
</span>

<span id="bad_Rascal_Expressions_Values_Relation_CarthesianProduct_1" class="answerStatus">
<span id="bad_Rascal_Expressions_Values_Relation_CartesianProduct_1" class="answerStatus">
<img height="25" width="25" src="/Courses/images/bad.png"/>
</span>

<span id="answerFeedback_Rascal_Expressions_Values_Relation_CarthesianProduct_1" class="answerFeedback"></span>
<span id="answerFeedback_Rascal_Expressions_Values_Relation_CartesianProduct_1" class="answerFeedback"></span>
<br/>

<form method="GET" action="validate" class="answerForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CarthesianProduct_1:S1" value="{6, -16, -15}">
<input type="hidden" name="Rascal_Expressions_Values_Relation_CarthesianProduct_1:S2" value="{14, -10}">
The type of <tt>{6, -16, -15} * {14, -10}</tt> is <input type="text" size="30" name="Rascal_Expressions_Values_Relation_CarthesianProduct_1:answer" class="answerText"><br/>
<form method="GET" action="validate" class="answerForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CartesianProduct_1:S1" value="{7, 6, -15}">
<input type="hidden" name="Rascal_Expressions_Values_Relation_CartesianProduct_1:S2" value="{17, 18}">
The type of <tt>{7, 6, -15} * {17, 18}</tt> is <input type="text" size="30" name="Rascal_Expressions_Values_Relation_CartesianProduct_1:answer" class="answerText"><br/>

<input type="submit" value="Give answer" class="answerSubmit">
</form>
<form method="GET" action="validate" class="anotherForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CarthesianProduct_1:another" value="yes">
<form method="GET" action="validate" class="anotherForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CartesianProduct_1:another" value="yes">

<input type="submit" value="I want another question" class="anotherSubmit">
</form><br/>

</div>

<div id="Rascal_Expressions_Values_Relation_CarthesianProduct_2" class="question">
<div id="Rascal_Expressions_Values_Relation_CartesianProduct_2" class="question">
<b>Question [2]. </b>
<span id="good_Rascal_Expressions_Values_Relation_CarthesianProduct_2" class="answerStatus">
<span id="good_Rascal_Expressions_Values_Relation_CartesianProduct_2" class="answerStatus">
<img height="25" width="25" src="/Courses/images/good.png"/>
</span>

<span id="bad_Rascal_Expressions_Values_Relation_CarthesianProduct_2" class="answerStatus">
<span id="bad_Rascal_Expressions_Values_Relation_CartesianProduct_2" class="answerStatus">
<img height="25" width="25" src="/Courses/images/bad.png"/>
</span>

<span id="answerFeedback_Rascal_Expressions_Values_Relation_CarthesianProduct_2" class="answerFeedback"></span>
<span id="answerFeedback_Rascal_Expressions_Values_Relation_CartesianProduct_2" class="answerFeedback"></span>
<br/>

<form method="GET" action="validate" class="answerForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CarthesianProduct_2:S1" value="{-18, -7, -8}">
<input type="hidden" name="Rascal_Expressions_Values_Relation_CarthesianProduct_2:S2" value="{2, -11}">
<pre class="prequestion">{-18, -7, -8} * {2, -11} == <input type="text" size="30" name="Rascal_Expressions_Values_Relation_CarthesianProduct_2:answer" class="answerText"></pre>
<form method="GET" action="validate" class="answerForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CartesianProduct_2:S1" value="{-3, 11, 15}">
<input type="hidden" name="Rascal_Expressions_Values_Relation_CartesianProduct_2:S2" value="{-1, 4}">
<pre class="prequestion">{-3, 11, 15} * {-1, 4} == <input type="text" size="30" name="Rascal_Expressions_Values_Relation_CartesianProduct_2:answer" class="answerText"></pre>
<input type="submit" value="Give answer" class="answerSubmit">
</form>
<form method="GET" action="validate" class="anotherForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CarthesianProduct_2:another" value="yes">
<form method="GET" action="validate" class="anotherForm"><input type="hidden" name="Rascal_Expressions_Values_Relation_CartesianProduct_2:another" value="yes">

<input type="submit" value="I want another question" class="anotherSubmit">
</form><br/>
Expand All @@ -153,8 +153,8 @@

</div>

<a id="tutorAction" href="/Courses/index.html"><img id="leftIcon" height="40" width="40" src="/Courses/images/rascal-tutor-small.png"></a><div id="editMenu">[<a id="editAction" href="/edit?concept=Rascal/Expressions/Values/Relation/CarthesianProduct&new=false"><b>Edit</b></a>] |
[<a id="newAction" href="/edit?concept=Rascal/Expressions/Values/Relation/CarthesianProduct&new=true"><b>New Subconcept</b></a>] |
<a id="tutorAction" href="/Courses/index.html"><img id="leftIcon" height="40" width="40" src="/Courses/images/rascal-tutor-small.png"></a><div id="editMenu">[<a id="editAction" href="/edit?concept=Rascal/Expressions/Values/Relation/CartesianProduct&new=false"><b>Edit</b></a>] |
[<a id="newAction" href="/edit?concept=Rascal/Expressions/Values/Relation/CartesianProduct&new=true"><b>New Subconcept</b></a>] |
[<a id="compileAction" href="/compile?name=Rascal"><b>Recompile Course</b></a>] |
[<a id="warnAction" href="/Courses/Rascal/warnings.html"><b>Warnings</b></a>]</div>
<span class="editMenuFooter">Is this page unclear, or have you spotted an error? Please add a comment below and help us to improve it. For all other questions and remarks, visit <a href="http://ask.rascal-mpl.org">ask.rascal-mpl.org</a>. </span>
Expand Down
1 change: 1 addition & 0 deletions ...lTutor/Courses/Rascal/Expressions/Values/Relation/CartesianProduct/CartesianProduct.quest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[tvQuestion("Rascal/Expressions/Values/Relation/CartesianProduct","1",typeOfExpr(),details(" ",[],"","","\<S1\> * \<S2\>","",false,false,[<"S1",set(int(-20,20),2,3)>,<"S2",set(int(-20,20),2,3)>],[],void(),"")),tvQuestion("Rascal/Expressions/Values/Relation/CartesianProduct","2",valueOfExpr(),details(" ",[],"","","\<S1\> * \<S2\> == ","",false,true,[<"S1",set(int(-20,20),2,3)>,<"S2",set(int(-20,20),2,2)>],[<"H","\<S1\> * \<S2\>">],void(),"\<H\>"))]
1 change: 0 additions & 1 deletion ...utor/Courses/Rascal/Expressions/Values/Relation/CarthesianProduct/CarthesianProduct.quest
View file

This file was deleted.

Loading

0 comments on commit 033793e

Please sign in to comment.