From c9ac7fcda8546f6580ecbc674d2bc92ed343bcc7 Mon Sep 17 00:00:00 2001 From: ProgrammedByHussain Date: Wed, 28 May 2025 16:43:15 -0400 Subject: [PATCH 1/4] DAP config + imports --- debugAdapterVSCode/package.json | 7 +++---- langs/tla/TLAParser.test.scala | 13 +++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/debugAdapterVSCode/package.json b/debugAdapterVSCode/package.json index 93f208c..418cd0d 100644 --- a/debugAdapterVSCode/package.json +++ b/debugAdapterVSCode/package.json @@ -35,13 +35,12 @@ "initialConfigurations": [ { "type": "dcal", + "name": "dcal", "request": "attach", - "name": "DCal DSL", - "stopOnEntry": true, - "port": 4711 + "debugServer": 4711 } ] } ] } -} \ No newline at end of file +} diff --git a/langs/tla/TLAParser.test.scala b/langs/tla/TLAParser.test.scala index f6dbffa..a43867f 100644 --- a/langs/tla/TLAParser.test.scala +++ b/langs/tla/TLAParser.test.scala @@ -16,6 +16,8 @@ package forja.langs.tla import forja.* import forja.source.{Source, SourceRange} +import forja.dsl.* +import forja.manip.DebugAdapter class TLAParserTests extends munit.FunSuite, test.WithTLACorpus: self => @@ -29,14 +31,9 @@ class TLAParserTests extends munit.FunSuite, test.WithTLACorpus: assume(!top.hasErrors, top) - TLAParser( - top, - // tracer = DebugAdapter( - // "localhost", - // 4711 - // ) - // , tracer = Manip.RewriteDebugTracer(os.pwd / "dbg_passes") - ) + instrumentWithTracer(DebugAdapter("localhost", 4711)): + TLAParser(top) + // re-enable if interesting: // val folder = os.SubPath(file.subRelativeTo(clonesDir).segments.init) From 782736149c399cf6beb300c3edc73052d69c6f2b Mon Sep 17 00:00:00 2001 From: ProgrammedByHussain Date: Thu, 29 May 2025 13:50:16 -0400 Subject: [PATCH 2/4] commented out DAP --- langs/tla/TLAParser.test.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/tla/TLAParser.test.scala b/langs/tla/TLAParser.test.scala index a43867f..6f412ff 100644 --- a/langs/tla/TLAParser.test.scala +++ b/langs/tla/TLAParser.test.scala @@ -31,8 +31,8 @@ class TLAParserTests extends munit.FunSuite, test.WithTLACorpus: assume(!top.hasErrors, top) - instrumentWithTracer(DebugAdapter("localhost", 4711)): - TLAParser(top) + // instrumentWithTracer(DebugAdapter("localhost", 4711)): + // TLAParser(top) // re-enable if interesting: From 91ca9bf9fd6ca8b1f9c7aad28491daa8b42b66cc Mon Sep 17 00:00:00 2001 From: ProgrammedByHussain Date: Thu, 29 May 2025 21:39:02 -0400 Subject: [PATCH 3/4] commented unused imports --- langs/tla/TLAParser.test.scala | 5 ++--- project.scala | 35 ++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/langs/tla/TLAParser.test.scala b/langs/tla/TLAParser.test.scala index 6f412ff..3100564 100644 --- a/langs/tla/TLAParser.test.scala +++ b/langs/tla/TLAParser.test.scala @@ -16,8 +16,8 @@ package forja.langs.tla import forja.* import forja.source.{Source, SourceRange} -import forja.dsl.* -import forja.manip.DebugAdapter +// import forja.dsl.* +// import forja.manip.DebugAdapter class TLAParserTests extends munit.FunSuite, test.WithTLACorpus: self => @@ -33,7 +33,6 @@ class TLAParserTests extends munit.FunSuite, test.WithTLACorpus: // instrumentWithTracer(DebugAdapter("localhost", 4711)): // TLAParser(top) - // re-enable if interesting: // val folder = os.SubPath(file.subRelativeTo(clonesDir).segments.init) diff --git a/project.scala b/project.scala index c0bf71b..c43ec23 100644 --- a/project.scala +++ b/project.scala @@ -1,18 +1,25 @@ // Main -//> using scala 3 -//> using options -Werror -Wunused:strict-no-implicit-warn -Yexplicit-nulls -deprecation -feature -//> using javaProperty distcompiler.Node.assertErrorRefCorrectness=no +//> using scala "3" -//> using dependency com.github.scopt::scopt:4.1.0 -//> using dependency com.lihaoyi::os-lib:0.11.4 -//> using dependency com.lihaoyi::pprint:0.9.0 -//> using dependency com.lihaoyi::sourcecode:0.4.2 -//> using dependency com.lihaoyi::ujson::4.2.1 -//> using dependency dev.zio::izumi-reflect:3.0.3 -//> using dependency edu.berkeley.cs.jqf:jqf-fuzz:2.1 -//> using dependency edu.berkeley.cs.jqf:jqf-instrument:2.1 -//> using dependency io.github.java-diff-utils:java-diff-utils:4.15 -//> using dependency org.typelevel::cats-core:2.13.0 +//> using options "-Werror" +//> using options "-Wunused:strict-no-implicit-warn" +//> using options "-Yexplicit-nulls" +//> using options "-deprecation" +//> using options "-feature" + +//> using javaProperty "distcompiler.Node.assertErrorRefCorrectness=no" + +//> using dependency "com.github.scopt::scopt:4.1.0" +//> using dependency "com.lihaoyi::os-lib:0.11.4" +//> using dependency "com.lihaoyi::pprint:0.9.0" +//> using dependency "com.lihaoyi::sourcecode:0.4.2" +//> using dependency "com.lihaoyi::ujson::4.2.1" +//> using dependency "dev.zio::izumi-reflect:3.0.3" +//> using dependency "edu.berkeley.cs.jqf:jqf-fuzz:2.1" +//> using dependency "edu.berkeley.cs.jqf:jqf-instrument:2.1" +//> using dependency "io.github.java-diff-utils:java-diff-utils:4.15" +//> using dependency "org.typelevel::cats-core:2.13.0" // Test -//> using test.dependency org.scalameta::munit:1.1.1 +//> using test.dependency "org.scalameta::munit:1.1.1" + From 59db95c9db8597a631580370639d12f6c849fe2b Mon Sep 17 00:00:00 2001 From: ProgrammedByHussain Date: Thu, 29 May 2025 23:42:28 -0400 Subject: [PATCH 4/4] reverting project.scala for checks --- project.scala | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/project.scala b/project.scala index c43ec23..c0bf71b 100644 --- a/project.scala +++ b/project.scala @@ -1,25 +1,18 @@ // Main -//> using scala "3" +//> using scala 3 +//> using options -Werror -Wunused:strict-no-implicit-warn -Yexplicit-nulls -deprecation -feature +//> using javaProperty distcompiler.Node.assertErrorRefCorrectness=no -//> using options "-Werror" -//> using options "-Wunused:strict-no-implicit-warn" -//> using options "-Yexplicit-nulls" -//> using options "-deprecation" -//> using options "-feature" - -//> using javaProperty "distcompiler.Node.assertErrorRefCorrectness=no" - -//> using dependency "com.github.scopt::scopt:4.1.0" -//> using dependency "com.lihaoyi::os-lib:0.11.4" -//> using dependency "com.lihaoyi::pprint:0.9.0" -//> using dependency "com.lihaoyi::sourcecode:0.4.2" -//> using dependency "com.lihaoyi::ujson::4.2.1" -//> using dependency "dev.zio::izumi-reflect:3.0.3" -//> using dependency "edu.berkeley.cs.jqf:jqf-fuzz:2.1" -//> using dependency "edu.berkeley.cs.jqf:jqf-instrument:2.1" -//> using dependency "io.github.java-diff-utils:java-diff-utils:4.15" -//> using dependency "org.typelevel::cats-core:2.13.0" +//> using dependency com.github.scopt::scopt:4.1.0 +//> using dependency com.lihaoyi::os-lib:0.11.4 +//> using dependency com.lihaoyi::pprint:0.9.0 +//> using dependency com.lihaoyi::sourcecode:0.4.2 +//> using dependency com.lihaoyi::ujson::4.2.1 +//> using dependency dev.zio::izumi-reflect:3.0.3 +//> using dependency edu.berkeley.cs.jqf:jqf-fuzz:2.1 +//> using dependency edu.berkeley.cs.jqf:jqf-instrument:2.1 +//> using dependency io.github.java-diff-utils:java-diff-utils:4.15 +//> using dependency org.typelevel::cats-core:2.13.0 // Test -//> using test.dependency "org.scalameta::munit:1.1.1" - +//> using test.dependency org.scalameta::munit:1.1.1