Merge branch 'main' of https://github.com/gabrielle-barnes/blvd

gabrielle-barnes · Apr 17, 2024 · f889f4d · f889f4d
2 parents d1eaf68 + 3bfd469
commit f889f4d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/src/analyzer.js b/src/analyzer.js
@@ -56,6 +56,10 @@ export default function analyze(match) {
     must(e.type === BOOLEAN, "Expected a boolean", at);
   }
 
+  function mustHaveListType(e, at) {
+    must(e.type?.kind === "ListType", "Expected a list", at);
+  }
+
   // function mustHaveAClassType(e, at) {
   //   must(e.type?.kind === "ClassType", "Expected a class", at);
   // }
@@ -122,13 +126,13 @@ export default function analyze(match) {
       case "BoolType":
         return "boolean";
       //case "ClassType":
-        //return type.name;
+      //return type.name;
       case "FunctionType":
         const paramTypes = type.paramTypes.map(typeDescription).join(", ");
         const returnType = typeDescription(type.returnType);
         return `(${paramTypes})->${returnType}`;
       //case "ListType":
-        //return `[${typeDescription(type.baseType)}]`;
+      //return `[${typeDescription(type.baseType)}]`;
     }
   }
 
@@ -456,8 +460,8 @@ export default function analyze(match) {
 
       return list._node.matchLength > 0 ? core.listType(baseType) : baseType;
     },
-    id(_first, _rest){
-      return this.sourceString
+    id(_first, _rest) {
+      return this.sourceString;
     },
     true(_) {
       return true;

diff --git a/src/blvd.ohm b/src/blvd.ohm
@@ -39,6 +39,8 @@ blvd {
   MemberExp     = given  
   Params        = ListOf<Param, ","> ","?
   Param         = Type id
+
+
 
   // EXTRA FUNCTIONS
   RangeFunc     = range from Exp "," Exp
@@ -58,6 +60,7 @@ blvd {
                 | Exp6
   Exp6          = "(" Exp ")"                               --parens
                 | "["ListOf<Exp, ","> "]"                   --listexp
+                | id "[" num "]"                            --subsript
                 | message                                   
                 | (true | false)
                 | Exp6 "(" ListOf<Exp, ","> ")"             --call

diff --git a/src/core.js b/src/core.js
@@ -19,7 +19,7 @@ export const boolType = { kind: "BoolType" };
 export const numberType = { kind: "NumberType" };
 export const stringType = { kind: "StringType " };
 //export function customType(type) {
-  //return { kind: "CustomType", id: type };
+//return { kind: "CustomType", id: type };
 //}
 export function emptyStatement() {
   return { kind: "EmptyStatement" };
@@ -64,13 +64,13 @@ export function functionDeclaration(name, parameters, returnType, body) {
 //   return { kind: "ClassDeclaration", name, fields, methods, constructor, functions };
 // }
 //export function field(type, name) {
-  //return { kind: "Field", type, name };
+//return { kind: "Field", type, name };
 //}
 // export function constructor(parameters, body) {
 //   return { kind: "Constructor", parameters, body };
 // }
 //export function memberExpression(object, id) {
-  //return { kind: "MemberExpression", object, id };
+//return { kind: "MemberExpression", object, id };
 //}
 export function rangeFunction(lowerbound, upperbound) {
   return { kind: "RangeFunction", lowerbound, upperbound };
@@ -81,12 +81,12 @@ export function binaryExpression(op, left, right, type) {
 export function unaryExpression(operand) {
   return { kind: "UnaryExpression", operand };
 }
+export function subscript(list, index) {
+  return { kind: "subscript", list, index, type: list.type.baseType };
+}
 export function listExpression(elements) {
   return { kind: "ListExpression", elements };
 }
-//export function subscriptExpression(array, index) {
-  //return { kind: "SubscriptExpression", array, index };
-//}
 export function call(callee, args) {
   return { kind: "Call", callee, args, type: callee.type.returnType };
 }

diff --git a/test/analyzer.test.js b/test/analyzer.test.js
@@ -52,6 +52,23 @@ const semanticChecks = [
     
     FIN`,
   ],
+  /*
+  [
+    "list indexing example",
+    `PROLOGUE
+    CAST string list shows as ["Martin", "Succession", "致我们单纯的小美好"]--
+    say(shows[1])--
+    END OF PROLOGUE
+    
+    ACT 1
+    
+    END OF ACT
+    
+    EPILOGUE
+    
+    FIN`,
+  ],
+  */
   [
     "increment and decrement",
     `PROLOGUE

diff --git a/test/parser.test.js b/test/parser.test.js
@@ -70,6 +70,10 @@ const syntaxChecks = [
     "class declarations",
     `PROLOGUE\n STAGE Movie:\n string a--\n string b--\n EXIT STAGE\n\n END OF PROLOGUE\n\n  ACT 1\n\n END OF ACT\n\n EPILOGUE\n\n FIN\n`,
   ],
+  [
+    "list indexing",
+    `PROLOGUE\n STAGE Movie:\n string a--\n string b--\n EXIT STAGE\n\n END OF PROLOGUE\n\n  ACT 1\n\n END OF ACT\n\n EPILOGUE\n\n FIN\n`,
+  ],
 ];
 
 const syntaxErrors = [