') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); refactor: make generated P4 AST the only evaluator source by opaopa6969 · Pull Request #82 · opaopa6969/tinyexpression · GitHub
Skip to content

refactor: make generated P4 AST the only evaluator source - #82

Merged
opaopa6969 merged 2 commits into
masterfrom
refactor/issue35-ast-direct-use
Aug 27, 2026
Merged

refactor: make generated P4 AST the only evaluator source#82
opaopa6969 merged 2 commits into
masterfrom
refactor/issue35-ast-direct-use

Conversation

@opaopa6969

@opaopa6969opaopa6969 commented Aug 27, 2026

Copy link
Copy Markdown
Owner

Summary

  • delete the reflective GeneratedP4NumberAstEvaluator safety net and source-shadow helpers for numeric/string/boolean expressions
  • delete slice/ternary source reparsers; evaluators and Java emitters consume generated AST fields directly
  • replace match regex/depth scanning with structural AST validation
  • make preferred-root selection deterministic and reject mapped descendants that do not cover the whole formula
  • remove runtime source-variant retries and update the LSP TE025 diagnostic/catalog
  • document the generated-only backend contract
  • refresh the bundled LSP/DAP server JAR

/* */ handling is a single layout-preserving lexical pass while tinyexpression remains on unlaxer-dsl 3.0.14. The generator-side correction is in unlaxer-parser PR #91 and can replace that bridge in the next monthly dependency release.

Verification

  • mvn -B -P p4-smoke test -Dgpg.skip=true -Dtinyexpression.skipRailroad=true — 85 tests
  • focused evaluator/emitter/backend parity matrix — 96 tests
  • mvn -B verify -Dgpg.skip=true in tools/tinyexpression-p4-lsp-vscode — 36 tests + VSIX package
  • git diff --check

Closes#35

@opaopa6969
opaopa6969 merged commit dc00e3b into masterAug 27, 2026
2 checks passed
@opaopa6969
opaopa6969 deleted the refactor/issue35-ast-direct-use branch August 27, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

refactor: ソース文字列再パースworkaround層をAST直接利用へ真っ当化 (~180箇所/17ファイル)

1 participant

@opaopa6969