Adding L2 Optimization

CONTRIBUTING.md

@@ -10,19 +10,18 @@ We use UV for dependency management, running tests, and pre-commit hooks.
 
 ## Fork and Clone the Repository
 
-1. Fork the repository: `https://github.com/clause/471c/fork`
-
-2. Choose your personal namespace or group for the fork.
+1. Fork the repository on GitHub (use your account or organization).
 
-3. Add `clause@udel.edu` and `wahid@udel.edu` as project members with the developer role.
+2. Clone your fork locally:
 
-4. Clone your fork locally either via command line or by using your preferred IDE.
-
-5. Link [CodeCov](https://about.codecov.io/) to your GitHub account (login to codecov using your github credentials).
+```bash
+git clone https://github.com/<your-org>/471c.git
+cd 471c
+```
 
-6. Update the badge URLs in README.md by replacing `clause` with `<NAMESPACE>` and `471c` with `<PROJECT>`.
+3. Enable GitHub Actions for your fork if desired (Actions → Enable workflows).
 
-7. Enable workflows for your fork by accessing the "actions" tab.
+4. If you use CodeCov, connect it to your GitHub account separately. Update badge URLs in `README.md` as needed for your fork.
 
 ## Install project dependencies
 

README.md

@@ -1,7 +1,7 @@
 # Status
 
-[![.github/workflows/ci.yml](https://github.com/clause/471c/actions/workflows/ci.yml/badge.svg)](https://github.com/clause/471c/actions/workflows/ci.yml)
-[![Coverage](https://codecov.io/gh/clause/471c/branch/main/graph/badge.svg)](https://codecov.io/gh/clause/471c)
+[![.github/workflows/ci.yml](https://github.com/JTFulkerson/471c/actions/workflows/ci.yml/badge.svg)](https://github.com/JTFulkerson/471c/actions/workflows/ci.yml)
+[![Coverage](https://codecov.io/gh/JTFulkerson/471c/branch/main/graph/badge.svg)](https://codecov.io/gh/JTFulkerson/471c)
 
 # Contributing 
 
@@ -12,3 +12,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 ![license](https://img.shields.io/badge/license-MIT-green.svg)
 
 This project is licensed under the MIT License. See [LICENSE](LICENSE) for details.
+
+## About
+
+`471c` is a multi-level language compiler project (L0..L4) with tooling and a VS Code language server that provides syntax and semantic diagnostics for L3/L4. See [lsp/README.md](lsp/README.md) for extension development instructions and the `packages/` directory for individual language packages.

lsp/.gitignore

@@ -0,0 +1,20 @@
+out
+node_modules
+client/server
+.vscode-test# Node dependencies
+node_modules/
+
+# TypeScript build output
+out/
+dist/
+build/
+*.tsbuildinfo
+
+# Test and coverage output
+coverage/
+.vscode-test/
+
+# Local environment and editor files
+.env
+.env.*
+.DS_Store

lsp/.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"dbaeumer.vscode-eslint"
+	]
+}

lsp/.vscode/launch.json

@@ -0,0 +1,37 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "extensionHost",
+			"request": "launch",
+			"name": "Launch Client",
+			"env": {
+				"PYTHONPATH": "${workspaceFolder}/../packages/L4/src:${workspaceFolder}/../packages/L3/src:${workspaceFolder}/../packages/L2/src:${workspaceFolder}/../packages/util/src"
+			},
+			"runtimeExecutable": "${execPath}",
+			"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+			"outFiles": [
+				"${workspaceRoot}/client/out/**/*.js",
+				"${workspaceRoot}/server/out/**/*.js"
+			],
+			"autoAttachChildProcesses": true,
+			"preLaunchTask": {
+				"type": "npm",
+				"script": "watch"
+			}
+		},
+		{
+			"name": "Language Server E2E Test",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}",
+				"--extensionTestsPath=${workspaceRoot}/client/out/test/index",
+				"${workspaceRoot}/client/testFixture"
+			],
+			"outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
+		}
+	]
+}

lsp/.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+	"editor.insertSpaces": false,
+	"typescript.tsc.autoDetect": "off",
+	"typescript.preferences.quoteStyle": "single",
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
+	}
+}

lsp/.vscode/tasks.json

@@ -0,0 +1,33 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "compile",
+			"group": "build",
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc"
+			]
+		},
+		{
+			"type": "npm",
+			"script": "watch",
+			"isBackground": true,
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc-watch"
+			]
+		}
+	]
+}

lsp/.vscodeignore

@@ -0,0 +1,15 @@
+.vscode/**
+**/*.ts
+**/*.map
+.gitignore
+**/tsconfig.json
+**/tsconfig.base.json
+contributing.md
+.travis.yml
+client/node_modules/**
+!client/node_modules/vscode-jsonrpc/**
+!client/node_modules/vscode-languageclient/**
+!client/node_modules/vscode-languageserver-protocol/**
+!client/node_modules/vscode-languageserver-types/**
+!client/node_modules/{minimatch,brace-expansion,concat-map,balanced-match}/**
+!client/node_modules/{semver,lru-cache,yallist}/**

lsp/README.md

@@ -0,0 +1,48 @@
+# LSP for L3/L4
+
+Language Server Protocol extension providing syntax and semantic diagnostics, semantic token highlighting for L3 and L4 language files (`.l3`, `.l4`).
+
+## Functionality
+
+This Language Server provides:
+- **Syntax diagnostics** — parser errors (e.g., unmatched parentheses)
+- **Semantic diagnostics** — type checking, unbound variables, duplicate bindings
+- **Semantic token highlighting** — keywords and types
+- **End-to-End tests** — regression tests for diagnostics and highlighting
+
+## Structure
+
+```
+.
+├── client              // VSCode extension client
+│   ├── src
+│   │   ├── extension.ts    // Extension entry point
+│   │   └── test/           // End-to-end tests
+│   └── testFixture/        // L3/L4 test files
+├── server              // Language server (Node.js)
+│   └── src/server.ts   // Server logic; calls L3/L4 Python diagnostics CLI
+├── package.json        // Extension manifest
+└── README.md           // This file
+```
+
+## Running the Extension
+
+- Run `npm install` in this folder to install dependencies
+- Open VS Code on this folder (or the repo root)
+- Press F5 to launch the Extension Development Host (or go to Run → Launch Client)
+- Open an `.l3` or `.l4` file to see diagnostics and highlighting
+- Run `npm test` to run end-to-end tests
+
+## L4 Development notes
+
+When working on the L4 compiler and server integration you will often need the local Python packages to be importable by the language server.
+
+- The `Launch Client` launch configuration now sets `PYTHONPATH` so the Extension Development Host can run the L4 diagnostics CLI against workspace sources.
+- To run the L4 CLI directly from the repo root (recommended):
+
+```bash
+cd /Users/johnfulkerson/src/CISC471/471c
+PYTHONPATH=packages/L4/src:packages/L3/src:packages/L2/src:packages/util/src .venv/bin/python -m L4.main packages/L4/examples/two.l4 --output /tmp/l4_two.py && .venv/bin/python /tmp/l4_two.py
+```
+
+- The server publishes a quick parenthesis syntax diagnostic immediately and replaces it with richer diagnostics produced by `python -m L4.main --diagnostics-json <file>` when available.