From 0a466052e03d718d933be22b0f7290b33a0f04a1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 26 Oct 2023 10:48:47 -0400 Subject: [PATCH 1/6] cleanup: Remove old submodules (again) * docker/linux * docker/windows --- docker/linux | 1 - docker/windows | 1 - 2 files changed, 2 deletions(-) delete mode 160000 docker/linux delete mode 160000 docker/windows diff --git a/docker/linux b/docker/linux deleted file mode 160000 index 653781226..000000000 --- a/docker/linux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65378122620c7a26561641cb49b477c822b315f2 diff --git a/docker/windows b/docker/windows deleted file mode 160000 index de7d40c09..000000000 --- a/docker/windows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit de7d40c09de473e1b2802c4b27e03dc7f0c360d6 From 633163518a74f0df6c697b87fa5b54dc8639b048 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 25 Oct 2023 11:38:29 -0400 Subject: [PATCH 2/6] fix: Fix divide token typo (should be fwd slash) --- .../ArithmeticExpressions/ArithmeticExpressionTokens.lex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressionTokens.lex b/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressionTokens.lex index 8446ae87e..e5048afb9 100644 --- a/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressionTokens.lex +++ b/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressionTokens.lex @@ -14,7 +14,7 @@ ParenthesisClose \) Add \+ Subtract \- Multiply \* -Divide \\ +Divide / Equals = Comma , From d0d3c9de4e08a455cf2850d8e32461f244ee4bc1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 25 Oct 2023 15:13:04 -0400 Subject: [PATCH 3/6] feat: Allow line-comments in DataStream parser Supports c#/c++ style line comments (i.e., that begin with '//') TODO: block comments --- .../DataStreamExpressions/DataStreamExpressionGrammar.y | 7 +++++++ .../DataStreamExpressions/DataStreamExpressionTokens.lex | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionGrammar.y b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionGrammar.y index 7b719a52b..c310c98fd 100644 --- a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionGrammar.y +++ b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionGrammar.y @@ -23,6 +23,7 @@ %token BOOLEAN_CONSTANT, INTEGER_CONSTANT, REAL_CONSTANT, DATE_TIME_CONSTANT, CS_STRING_CONSTANT, NULL_CONSTANT %token PARENTHESIS_OPEN, PARENTHESIS_CLOSE, COMMA, IDENTIFIER, EQUALS, QUOTE_OPEN, QUOTE_CLOSE +%token LINE_COMMENT %nonassoc EQUALS @@ -49,6 +50,12 @@ Statement : | IDENTIFIER EQUALS Statement { $$ = new Assignment($1.Identifier, $3); } + | LINE_COMMENT Statement { + $$ = $2; + } + | Statement LINE_COMMENT { + $$ = $1; + } ; Arguments : diff --git a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex index 42c789517..8aae15ea0 100644 --- a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex +++ b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex @@ -26,6 +26,9 @@ Comma , QuoteOpen \[ QuoteClose \] +/* Comments */ +LineComment \/\/[^\n\r]*(\n|\r|\r\n) + %% {Equals} { @@ -92,4 +95,8 @@ QuoteClose \] return (int)DataStreamExpressionToken.IDENTIFIER; } +{LineComment} { + return (int)DataStreamExpressionToken.LINE_COMMENT; +} + %% From 3b059ebdfa948f68886bd71d74dbe3166f7a0521 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 26 Oct 2023 14:19:50 -0400 Subject: [PATCH 4/6] fix: Format arguments properly in DataStream code gen Previously, all arguments were formatted as "Bts.DataStream.Argument" (from the default ToString) --- .../PrimitiveExpression.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs b/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs index 045157b83..357664ae2 100644 --- a/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs +++ b/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs @@ -48,14 +48,26 @@ public class PrimitiveExpression : StatementExpression { return PrimitiveManager.instance.build(myName, resolvedArgs); } + string myPrintSingleArg(int atColumn, object? o, IList activeBindings) { + /// Unwrap to get its underlying value + while (o is Argument arg) { + o = arg.Obj; + // Safeguard against infinite loop + if (ReferenceEquals(o, arg)) { + throw new ArgumentException( + $"Detected circular reference in argument " + + $"('{nameof(arg)}.{nameof(arg.Obj)}' is '{nameof(arg)}' itself)"); + } + } - string myPrintSingleArg(int atColumn, object o, IList activeBindings) { + string result = new string(' ', atColumn); + if (o is null) { + return result; + } if (o is StatementExpression) return new string(' ', atColumn) + ((o as StatementExpression)?.print(atColumn, activeBindings) ?? string.Empty); else { - string result = new string(' ', atColumn); - if (o is string) result += makeCSString((string)o); else if (o is DateTime) From 292fa54dda461a2aaf3fbe88fac100297c4218a9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 26 Oct 2023 14:31:20 -0400 Subject: [PATCH 5/6] fix: Get rid of hardcoded path to dll Use Assembly.Location instead Bugs (fixed): * PubSubServer throws an exception on startup because it can't find dll at hardcoded path --- src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs b/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs index 56242ea27..4f49c5e45 100644 --- a/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs +++ b/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs @@ -1,4 +1,6 @@ using System; +using System.IO; +using System.Reflection; namespace BCG { [Serializable] @@ -6,8 +8,11 @@ namespace BCG { //[Serializable] public class Entry { public string handlerClass = "BCG.PubSubServerTagHandler"; - // TODOds - public string assembly = "C:\\Users\\m_tah\\spark\\build\\Debug\\bin\\net7.0\\DataStreamCore.dll"; + + public string assembly = Path.Combine( + Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, + "DataStreamCore.dll"); + public override string ToString() { return $"handlerClass: {handlerClass} assembly: {assembly}"; } From cba32be99db1233269fcf51bb1999f9fc5448ccd Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 26 Oct 2023 14:37:56 -0400 Subject: [PATCH 6/6] fix build: Use relative path in csproj references The build was broken because Spark.csproj was looking for SharedStreams at some hardcoded path on taha's comp --- src/client/spark/Spark.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index c18698616..5ee8ed0dc 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -55,7 +55,7 @@ - +