Lesson7 of tutorial finished

packages/samples/EduTutorialNew/lesson6-defs/edu.scope

@@ -0,0 +1,3 @@
+scoper EducationScoper for language Education
+
+isnamespace { Page  }

packages/samples/EduTutorialNew/lesson7-defs/edu-flow.ast

@@ -1,7 +1,7 @@
 language Education
 
 modelunit Flow {
-    reference main: MainTopic;
+    reference main: SiteGroup;
     rules: FlowRule[];
 }
 

packages/samples/EduTutorialNew/lesson7-defs/edu-flow.edit

@@ -3,7 +3,7 @@
 editor default
 
 Flow {[
-    Flow ${self.name} for MainTopic ${self.main}
+    Flow ${self.name} for SiteGroup ${self.main}
 
     ${self.rules vertical}
 ]}

packages/samples/EduTutorialNew/lesson7-defs/edu-main.ast

@@ -5,10 +5,10 @@ model Education /* Computer Aided Learning */ {
     topic: Topic[];
     flow: Flow[];
     tests: Test[];
-    overviews: MainTopic[];
+    overviews: SiteGroup[];
 }
 
-modelunit MainTopic {
+modelunit SiteGroup {
     name: identifier;
     description: string; /* e.g. Mathematics, fractions for students age 10 */
     reference topics: Topic[];

packages/samples/EduTutorialNew/lesson7-defs/edu-main.edit

@@ -2,8 +2,8 @@
 
 editor default
 
-MainTopic {[
-    MainTopic Overview
+SiteGroup {[
+    SiteGroup Overview
 
         Name: ${self.name}
 

packages/samples/EduTutorialNew/lesson7-defs/edu-tests.ast

@@ -3,7 +3,7 @@ language Education
 modelunit Test {
     name: identifier;
     scenarios: Scenario[];
-    reference main: MainTopic;
+    reference main: SiteGroup;
     reference flow: Flow;
 }
 
@@ -12,18 +12,17 @@ concept Scenario {
     testFlow: TestFlow[];
     steps: Step[]; /* Note that the order is of importance */
 }
+
 concept TestFlow {
     steps: Step[]; /* Note that the order is of importance */
 }
+
 concept Step {
-    reference expectedPage: Page;
+    reference fromPage: Page;
     answerSeries: Answer[];
 }
 
-concept StartStep base Step {
-    reference fromPage: Page;
-    reference expectedPage: Page;
-    answerSeries: Answer[];
+concept LastStep base Step {
 }
 
 concept Answer {

packages/samples/EduTutorialNew/lesson7-defs/edu-tests.edit

@@ -15,15 +15,15 @@ Scenario {[
 ]}
 
 TestFlow {[
-    ${self.steps horizontal}
+    ${self.steps horizontal separator[===>]}
 ]}
 
 Step {[
-    => ${self.answerSeries table rows} => ${self.expectedPage}
+    ${self.fromPage} => ${self.answerSeries table rows}
 ]}
 
-StartStep {[
-    ${self.fromPage} => ${self.answerSeries table rows} => ${self.expectedPage}
+LastStep {[
+    ${self.fromPage}
 ]}
 
 Answer { table [

packages/samples/EduTutorialNew/lesson7-defs/edu-topics.ast

@@ -2,7 +2,7 @@ language Education
 
 modelunit Topic {
     name: identifier;
-    reference main: MainTopic;
+    reference main: SiteGroup;
     description: string;
     pages: Page[];
 }

packages/samples/EduTutorialNew/lesson7-defs/edu-topics.edit

@@ -3,7 +3,7 @@
 editor default
 
 Topic {[
-    MainTopic: ${self.main}
+    SiteGroup: ${self.main}
     Topic: ${self.name}
     Topic description: ${self.description}
 

packages/samples/EduTutorialNew/lesson7-defs/edu.scope

@@ -0,0 +1,7 @@
+scoper EducationScoper for language Education
+
+isnamespace { Page, Step }
+
+Step {
+    namespace_addition = self.fromPage;
+}

packages/samples/EduTutorialNew/lesson7-defs/page-footing.edit

@@ -4,7 +4,7 @@ editor footing
 
 Page {[
     Questions:
-        ${self.questions vertical terminator [END]}
+        ${self.questions vertical}
 
     Score
         ${self.grading vertical}

packages/samples/EduTutorialNew/lesson8-defs/edu-flow-table.edit

@@ -0,0 +1,17 @@
+/* This file contains the rules-as-tables editor definition. */
+
+editor rules_as_table
+
+FlowRule {[
+    -------------------------------------
+    Name: ${name}
+        Description: ${self.description}
+        For page ${page}
+
+        ${self.transitions table rows}
+]}
+
+PageTransition { table [
+    Condition          | Goto Page
+    ${self.condition}  |  ${self.toPage}
+]}

packages/samples/EduTutorialNew/lesson8-defs/edu-flow.ast

@@ -0,0 +1,27 @@
+language Education
+
+modelunit Flow {
+    reference main: SiteGroup;
+    rules: FlowRule[];
+}
+
+concept FlowRule {
+    name: identifier;
+    description: string;
+    reference page: Page;
+    transitions: PageTransition[];
+}
+
+concept PageTransition { /* E.g. Grade A => show pageA, Grade F => show pageC */
+    condition: Grade; /* Note: will be changed into an expression later in the tutorial. */
+    reference toPage: Page;
+}
+
+limited Grade {
+    gradeA;
+    gradeB;
+    gradeC;
+    gradeD;
+    gradeE;
+    gradeF;
+}

packages/samples/EduTutorialNew/lesson8-defs/edu-flow.edit

@@ -0,0 +1,22 @@
+/* This file contains the default editor definition. */
+
+editor default
+
+Flow {[
+    Flow ${self.name} for SiteGroup ${self.main}
+
+    ${self.rules vertical}
+]}
+
+FlowRule {[
+    -------------------------------------
+    Name: ${self.name}
+    Description: ${self.description}
+    From page ${self.page}
+
+        ${self.transitions}
+]}
+
+PageTransition {[
+    when ${self.condition} goto page ${self.toPage}
+]}

packages/samples/EduTutorialNew/lesson8-defs/edu-main.ast

@@ -0,0 +1,17 @@
+language Education
+
+model Education /* Computer Aided Learning */ {
+    name: identifier;
+    topic: Topic[];
+    flow: Flow[];
+    tests: Test[];
+    overviews: SiteGroup[];
+}
+
+modelunit SiteGroup {
+    name: identifier;
+    description: string; /* e.g. Mathematics, fractions for students age 10 */
+    reference topics: Topic[];
+    reference flows: Flow[];
+    reference tests: Test[];
+}

packages/samples/EduTutorialNew/lesson8-defs/edu-main.edit

@@ -0,0 +1,15 @@
+/* This file contains the default editor definition. */
+
+editor default
+
+SiteGroup {[
+    SiteGroup Overview
+
+        Name: ${self.name}
+
+        Description: ${self.description}
+
+        Topics: ${self.topics}
+
+        Flows: ${self.flows}
+]}

packages/samples/EduTutorialNew/lesson8-defs/edu-scoring.ast

@@ -0,0 +1,70 @@
+language Education
+
+concept GradeScore {
+    grade: Grade;
+    expr: ScoreExpression;
+}
+
+///////////////////////////////////
+/// Expressions
+//////////////////////////////////
+abstract expression ScoreExpression {
+}
+
+/* The value of a question reference is the answer given to the
+given question */
+expression QuestionReference base ScoreExpression {
+    reference question: Question;
+}
+
+/* The value of NrOfCorrectAnswers is the total number of correct
+answers on a page. */
+expression NrOfCorrectAnswers base ScoreExpression {
+}
+
+/* The value of a NumberLiteralExpression is simply a number, like '24' */
+expression NumberLiteralExpression base ScoreExpression {
+    value: number;
+}
+
+///////////////////////////////////
+/// Boolean AND and OR
+//////////////////////////////////
+abstract binary expression BinaryExpression base ScoreExpression {
+    left: ScoreExpression;
+    right: ScoreExpression;
+}
+
+binary expression AndExpression base BinaryExpression {
+    priority = 1;
+}
+
+binary expression OrExpression base BinaryExpression {
+    priority = 1;
+}
+
+///////////////////////////////////
+/// Comparisons: <=, >=, >, <, ===
+//////////////////////////////////
+abstract binary expression ComparisonExpression base BinaryExpression {
+}
+
+binary expression LessOrEqualsExpression base ComparisonExpression {
+    priority = 2;
+}
+
+binary expression GreaterOrEqualsExpression base ComparisonExpression {
+    priority = 2;
+}
+
+binary expression LessThenExpression base ComparisonExpression {
+    priority = 2;
+}
+
+binary expression GreaterThenExpression base ComparisonExpression {
+    priority = 2;
+}
+
+binary expression EqualsExpression base ComparisonExpression {
+    priority = 2;
+}

packages/samples/EduTutorialNew/lesson8-defs/edu-scoring.edit

@@ -0,0 +1,54 @@
+editor default
+
+GradeScore {[
+    ${self.grade} : ${self.expr}
+]}
+
+///////////////////////////////////
+/// Expressions
+//////////////////////////////////
+
+QuestionReference {
+    [ Answer to ${self.question} is correct ]
+    trigger = "question"
+    referenceShortcut = ${self.question}
+}
+
+NrOfCorrectAnswers {
+    [Number Of Correct Answers]
+}
+
+NumberLiteralExpression {
+    [${value}]
+}
+
+///////////////////////////////////
+/// Boolean AND and OR
+//////////////////////////////////
+
+OrExpression {
+    symbol = "or"
+}
+AndExpression {
+    symbol = "and"
+}
+
+///////////////////////////////////
+/// Comparisons: <=, >=, >, <, ===
+//////////////////////////////////
+
+LessOrEqualsExpression {
+    symbol = "<="
+}
+GreaterOrEqualsExpression {
+    symbol = ">="
+}
+LessThenExpression {
+    symbol = "<"
+}
+GreaterThenExpression {
+    symbol = ">"
+}
+EqualsExpression {
+    symbol = "=="
+}

packages/samples/EduTutorialNew/lesson8-defs/edu-tests.ast

@@ -0,0 +1,31 @@
+language Education
+
+modelunit Test {
+    name: identifier;
+    scenarios: Scenario[];
+    reference main: SiteGroup;
+    reference flow: Flow;
+}
+
+concept Scenario {
+    description: string;
+    testFlow: TestFlow[];
+    steps: Step[]; /* Note that the order is of importance */
+}
+
+concept TestFlow {
+    steps: Step[]; /* Note that the order is of importance */
+}
+
+concept Step {
+    reference fromPage: Page;
+    answerSeries: Answer[];
+}
+
+concept LastStep base Step {
+}
+
+concept Answer {
+    reference question: Question;
+    value: NumberConcept;
+}