Compare commits
6 Commits
0.11.6
...
a630cac9a1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a630cac9a1 | ||
|
|
8475389b99 | ||
| 1d68b70fa5 | |||
| e41d93e301 | |||
| 19fdbe4dac | |||
| ec1e65c03b |
@@ -57,16 +57,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $1}')
|
REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $1}')
|
||||||
REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $2}' | tr '-' '_')
|
REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F '/' '{print $2}' | tr '-' '_')
|
||||||
REPOSITORY_SOURCE_NAME=gitea-repo
|
|
||||||
if [ -z "$(dotnet nuget config get all | grep "/packages/${REPOSITORY_OWNER}/nuget/index.json")" ]; then
|
|
||||||
echo "source repo not configured yet"
|
|
||||||
dotnet nuget add source --name $REPOSITORY_SOURCE_NAME https://git.disi.dev/api/packages/$REPOSITORY_OWNER/nuget/index.json
|
|
||||||
else
|
|
||||||
echo "Picking correct source repo"
|
|
||||||
QUOTED_REPOSITORY_SOURCE_NAME=$(dotnet nuget config get all | grep "/packages/${REPOSITORY_OWNER}/nuget/index.json" | awk '{print $2}' | awk -F= '{print $2}')
|
|
||||||
REPOSITORY_SOURCE_NAME=${QUOTED_REPOSITORY_SOURCE_NAME:1:-2}
|
|
||||||
echo "chosen repo is $REPOSITORY_SOURCE_NAME"
|
|
||||||
fi
|
|
||||||
dotnet pack --include-symbols --include-source -p:PackageVersion=$(cat $REPOSITORY_NAME/VERSION) TextParser.sln
|
dotnet pack --include-symbols --include-source -p:PackageVersion=$(cat $REPOSITORY_NAME/VERSION) TextParser.sln
|
||||||
echo "dotnet nuget push -k <GITEA_PAT> --source $REPOSITORY_SOURCE_NAME $REPOSITORY_NAME/bin/Release/$REPOSITORY_NAME.$(cat $REPOSITORY_NAME/VERSION).symbols.nupkg"
|
echo "dotnet nuget push -k ${GITEA_PAT:0:-15} $REPOSITORY_NAME/bin/Release/$REPOSITORY_NAME.$(cat $REPOSITORY_NAME/VERSION).symbols.nupkg"
|
||||||
dotnet nuget push -k $GITEA_PAT --source $REPOSITORY_SOURCE_NAME $REPOSITORY_NAME/bin/Release/$REPOSITORY_NAME.$(cat $REPOSITORY_NAME/VERSION).symbols.nupkg
|
dotnet nuget push -k $GITEA_PAT $REPOSITORY_NAME/bin/Release/$REPOSITORY_NAME.$(cat $REPOSITORY_NAME/VERSION).symbols.nupkg
|
||||||
|
|||||||
258
HISTORY.md
258
HISTORY.md
@@ -1,258 +0,0 @@
|
|||||||
Changelog
|
|
||||||
=========
|
|
||||||
|
|
||||||
|
|
||||||
(unreleased)
|
|
||||||
------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Bugfix, refs NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.11.5 (2025-10-26)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Fix default push NuGet source, refs NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.11.4 (2025-10-26)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Set default push NuGet source, refs NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.11.3 (2025-10-26)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Reenable all NuGet sources, refs NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.11.2 (2025-10-26)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Even more debug output during releases, refs NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.11.1 (2025-10-26)
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- More debug output during releases, refs NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
- Ci: reenable one of the NuGet sources, refs NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.11.0 (2025-10-26)
|
|
||||||
-------------------
|
|
||||||
- Revert "feat: add two dimensional data walker, refs: NOISSUE" [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
This reverts commit 414c74be84aecd3aff2f7abbb6cab88f50034d84.
|
|
||||||
- Ci: disable nuget feeds for now, refs NOISSUE. [Simon Diesenreiter]
|
|
||||||
- Feat: add two dimensional data walker, refs: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.10.0 (2024-12-13)
|
|
||||||
-------------------
|
|
||||||
- Feat: add support for custom token types and longs, ref: NOISSUE.
|
|
||||||
[Simon Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.9.3 (2024-12-13)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Remove duplicate TokenConverter definition, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.9.2 (2024-12-13)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- More bugfixes, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.9.1 (2024-12-13)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Fix build issues, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.9.0 (2024-12-13)
|
|
||||||
------------------
|
|
||||||
- Feat: add filter option to TokenConverter, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.8.0 (2024-12-12)
|
|
||||||
------------------
|
|
||||||
- Feat: adding sensible index constructors refs: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.7.2 (2024-12-05)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Add some missing API methods, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.7.1 (2024-12-05)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Allow for parsing single chars as input, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.7.0 (2024-12-05)
|
|
||||||
------------------
|
|
||||||
- Feat: implement generic data set manipulator, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.6.0 (2024-12-03)
|
|
||||||
------------------
|
|
||||||
- Feat: enable named literals, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.5.1 (2024-12-03)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Some bugfixes with fragment parser logic, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.5.0 (2024-12-03)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Fix bugs with fragment parsing support, refs: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
- Feat: initial support for fragment parsing, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.4.0 (2024-12-02)
|
|
||||||
------------------
|
|
||||||
- Style: fix linting errors, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
- Feat: implement greedy repetition, ref: A24-13. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.3.0 (2024-12-02)
|
|
||||||
------------------
|
|
||||||
- Feat: ci pipeline fix for releases, ref NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.2.3 (2024-12-02)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- More release script fixes,ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.2.2 (2024-12-02)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Increment version,refs:NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
|
|
||||||
|
|
||||||
0.2.1 (2024-12-02)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Fix file inclusion in tag commits, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.2.0 (2024-12-02)
|
|
||||||
------------------
|
|
||||||
|
|
||||||
Fix
|
|
||||||
~~~
|
|
||||||
- Fix some bugs and tests, ref: A24-3. [Simon Diesenreiter]
|
|
||||||
|
|
||||||
Other
|
|
||||||
~~~~~
|
|
||||||
- Ci: fix release shortcut, ref: NOISSUE. [Simon Diesenreiter]
|
|
||||||
- Feat: add text parser and output format options, ref: A24-3. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
|
|
||||||
|
|
||||||
0.1.0 (2024-12-01)
|
|
||||||
------------------
|
|
||||||
- Feat: added initial implementation of TextParser, ref: A24-3. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
- ✅ Ready to clone and code. [simon]
|
|
||||||
- Ci: initial commit for triggering migration, ref: NOISSUE. [Simon
|
|
||||||
Diesenreiter]
|
|
||||||
- Initial commit. [Projects <>]
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ public class TextParserTests
|
|||||||
bca
|
bca
|
||||||
cab";
|
cab";
|
||||||
private const string testInput11 = @"2 x y 4 x y 6 x y 4 x y 1 x y";
|
private const string testInput11 = @"2 x y 4 x y 6 x y 4 x y 1 x y";
|
||||||
|
private const string testInput12 = @"abcd";
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void LineParser_TestSimpleRepetition()
|
public void LineParser_TestSimpleRepetition()
|
||||||
@@ -443,4 +444,27 @@ public class TextParserTests
|
|||||||
Assert.Equal(4, numbers[3]);
|
Assert.Equal(4, numbers[3]);
|
||||||
Assert.Equal(1, numbers[4]);
|
Assert.Equal(1, numbers[4]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void TextParser_TestCharExplicit()
|
||||||
|
{
|
||||||
|
var schemaBuilder = new InputSchemaBuilder();
|
||||||
|
var schema = schemaBuilder
|
||||||
|
.Repeat()
|
||||||
|
.Expect(InputType.Char)
|
||||||
|
.EndRepetition()
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
var parser = new TextParser<InputSchemaContext>(schema);
|
||||||
|
var numbers = parser
|
||||||
|
.SetInputText(testInput12)
|
||||||
|
.Parse()
|
||||||
|
.AsSingleStream<string>();
|
||||||
|
|
||||||
|
Assert.Equal(4, numbers.Count);
|
||||||
|
Assert.Equal("a", numbers[0]);
|
||||||
|
Assert.Equal("b", numbers[1]);
|
||||||
|
Assert.Equal("c", numbers[2]);
|
||||||
|
Assert.Equal("d", numbers[3]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,6 @@ class CharBlock : BuildingBlockBase
|
|||||||
|
|
||||||
public override BlockType GetBlockType()
|
public override BlockType GetBlockType()
|
||||||
{
|
{
|
||||||
return BlockType.String;
|
return BlockType.Char;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,6 +17,7 @@ public class FragmentSchema : ISchema<FragmentSchemaContext>
|
|||||||
private string fragmentRegex;
|
private string fragmentRegex;
|
||||||
private List<string> namedGroups = new List<string>();
|
private List<string> namedGroups = new List<string>();
|
||||||
private List<string> namedLiterals = new List<string>();
|
private List<string> namedLiterals = new List<string>();
|
||||||
|
private bool ignoreEmptyMatches = true;
|
||||||
|
|
||||||
public FragmentSchema(string fragmentRegex, List<string> namedGroups, List<string> namedLiterals)
|
public FragmentSchema(string fragmentRegex, List<string> namedGroups, List<string> namedLiterals)
|
||||||
{
|
{
|
||||||
@@ -33,6 +34,11 @@ public class FragmentSchema : ISchema<FragmentSchemaContext>
|
|||||||
// one token per match
|
// one token per match
|
||||||
foreach (Match match in r.Matches(inputs.YieldWord()))
|
foreach (Match match in r.Matches(inputs.YieldWord()))
|
||||||
{
|
{
|
||||||
|
if(this.ignoreEmptyMatches && string.IsNullOrEmpty(match.Value))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var newToken = new FragmentToken(match.Value);
|
var newToken = new FragmentToken(match.Value);
|
||||||
// token contains data from all included matches
|
// token contains data from all included matches
|
||||||
foreach (var groupName in this.namedGroups)
|
foreach (var groupName in this.namedGroups)
|
||||||
@@ -109,4 +115,9 @@ public class FragmentSchema : ISchema<FragmentSchemaContext>
|
|||||||
{
|
{
|
||||||
return new FragmentSchemaContext();
|
return new FragmentSchemaContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ShouldIgnoreEmptyMatches(bool ignoreEmptyMatches)
|
||||||
|
{
|
||||||
|
this.ignoreEmptyMatches = ignoreEmptyMatches;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,12 +52,22 @@ public class FragmentSchemaBuilder : RepetitionSchemaBuilder<FragmentSchemaBuild
|
|||||||
case InputType.Integer:
|
case InputType.Integer:
|
||||||
this.fragmentRegex += "(" + groupNamePrefix + "\\d+)";
|
this.fragmentRegex += "(" + groupNamePrefix + "\\d+)";
|
||||||
break;
|
break;
|
||||||
|
case InputType.Char:
|
||||||
|
this.fragmentRegex += "(" + groupNamePrefix + "[a-zA-Z])";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Exception("Unrecognized InputType");
|
throw new Exception("Unrecognized InputType");
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public FragmentSchemaBuilder ShouldIgnoreEmptyMatches(bool ignoreEmptyMatches)
|
||||||
|
{
|
||||||
|
this.ShouldIgnoreEmptyMatches(ignoreEmptyMatches);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public FragmentSchemaBuilder Expect(string literal, string name = "")
|
public FragmentSchemaBuilder Expect(string literal, string name = "")
|
||||||
{
|
{
|
||||||
string groupNamePrefix = "";
|
string groupNamePrefix = "";
|
||||||
@@ -130,6 +140,10 @@ public class FragmentSchemaBuilder : RepetitionSchemaBuilder<FragmentSchemaBuild
|
|||||||
}
|
}
|
||||||
|
|
||||||
oldSchemaBuilder.fragmentRegex += "(" + currentRegex + ")";
|
oldSchemaBuilder.fragmentRegex += "(" + currentRegex + ")";
|
||||||
|
var groupsToAdd = currentBuilder.namedGroups.Where(g => !oldSchemaBuilder.namedGroups.Contains(g)).ToList();
|
||||||
|
var literalsToAdd = currentBuilder.namedLiterals.Where(l => !oldSchemaBuilder.namedLiterals.Contains(l)).ToList();
|
||||||
|
oldSchemaBuilder.namedGroups.AddRange(groupsToAdd);
|
||||||
|
oldSchemaBuilder.namedLiterals.AddRange(literalsToAdd);
|
||||||
|
|
||||||
return oldSchemaBuilder;
|
return oldSchemaBuilder;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
0.11.6
|
0.12.0
|
||||||
|
|||||||
Reference in New Issue
Block a user