Merge branch 'development' of bitbucket.org:bluetradesys/spark into development

This commit is contained in:
Mohammad Arham committed 2023-11-02 07:46:49 -07:00
commit d45c79c44b
7 files changed
+38 -8

No files matched your search

Submodule docker/windows deleted from de7d40c09d.
@@ -14,7 +14,7 @@ ParenthesisClose \)
Add \+
Subtract \-
Multiply \*
Divide \\
Divide /
Equals =
Comma ,
@@ -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 :
@@ -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;
}
%%
@@ -48,14 +48,26 @@ public class PrimitiveExpression : StatementExpression {
return PrimitiveManager.instance.build(myName, resolvedArgs);
}
string myPrintSingleArg(int atColumn, object? o, IList<string> activeBindings) {
/// Unwrap <see cref="Argument"/> 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<string> 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)
@@ -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}";
}
+1 -1
View File
@@ -55,7 +55,7 @@
<ItemGroup>
<ProjectReference Include="..\spark_api\spark_api.csproj" />
<ProjectReference Include="..\spark_core\spark_core.csproj" />
<ProjectReference Include="C:\Users\m_tah\spark\src\DataStreamSuite\SharedStreams\SharedStreams.csproj" />
<ProjectReference Include="..\..\DataStreamSuite\SharedStreams\SharedStreams.csproj" />
</ItemGroup>
<ItemGroup>