|
6 | 6 | using System.Collections.Generic; |
7 | 7 | using System.Collections.Immutable; |
8 | 8 | using System.Linq; |
| 9 | +using System.Linq.Expressions; |
9 | 10 | using System.Reflection; |
10 | 11 | using System.Text; |
11 | 12 |
|
@@ -293,6 +294,7 @@ public override void VisitParameter(ParameterSyntax node) |
293 | 294 | Visit(asNode); |
294 | 295 | break; |
295 | 296 | } |
| 297 | + case SyntaxKind.GenericName: |
296 | 298 | case SyntaxKind.IdentifierName: |
297 | 299 | case SyntaxKind.PredefinedType: |
298 | 300 | break; |
@@ -407,6 +409,7 @@ public override void VisitExpressionStatement(ExpressionStatementSyntax node) |
407 | 409 |
|
408 | 410 | switch (kind) |
409 | 411 | { |
| 412 | + case SyntaxKind.PostDecrementExpression: |
410 | 413 | case SyntaxKind.InvocationExpression: |
411 | 414 | case SyntaxKind.SimpleAssignmentExpression: |
412 | 415 | { |
@@ -454,6 +457,10 @@ public override void VisitArgument(ArgumentSyntax node) |
454 | 457 |
|
455 | 458 | switch (kind) |
456 | 459 | { |
| 460 | + case SyntaxKind.AsExpression: |
| 461 | + case SyntaxKind.MultiplyExpression: |
| 462 | + case SyntaxKind.InvocationExpression: |
| 463 | + case SyntaxKind.AddExpression: |
457 | 464 | case SyntaxKind.ParenthesizedExpression: |
458 | 465 | case SyntaxKind.ThisExpression: |
459 | 466 | case SyntaxKind.ParenthesizedLambdaExpression: |
@@ -1162,6 +1169,9 @@ public override void VisitParenthesizedExpression(ParenthesizedExpressionSyntax |
1162 | 1169 |
|
1163 | 1170 | switch (kind) |
1164 | 1171 | { |
| 1172 | + case SyntaxKind.AddExpression: |
| 1173 | + Visit(asNode); |
| 1174 | + break; |
1165 | 1175 | case SyntaxKind.AsExpression: |
1166 | 1176 | _SNOriginal = (asNode as BinaryExpressionSyntax).Left; |
1167 | 1177 |
|
@@ -1351,6 +1361,12 @@ where e.Kind() == SyntaxKind.IdentifierToken |
1351 | 1361 | { |
1352 | 1362 | JSSB.Append($" {syntaxNode.ToString()}"); |
1353 | 1363 | } |
| 1364 | + |
| 1365 | + if (CustomCSNamesToJS(syntaxNode) == false) |
| 1366 | + { |
| 1367 | + SM.Log($"TODO : {syntaxNode} ||| USE 'CustomCSNamesToJS' TO CONVERT."); |
| 1368 | + } |
| 1369 | + |
1354 | 1370 | } |
1355 | 1371 | break; |
1356 | 1372 | } |
@@ -1538,10 +1554,15 @@ where e.Kind() == SyntaxKind.IdentifierToken |
1538 | 1554 |
|
1539 | 1555 | if (item is FieldDeclarationSyntax f) |
1540 | 1556 | { |
1541 | | - var d3 = from e in f.DescendantTokens() |
| 1557 | + IEnumerable<SyntaxNode> vds = (from el in f.DescendantNodes() |
| 1558 | + where el.Kind() == SyntaxKind.VariableDeclarator |
| 1559 | + select el); |
| 1560 | + |
| 1561 | + var d3 = from e in vds.First().DescendantNodesAndTokens() |
1542 | 1562 | where e.Kind() == SyntaxKind.IdentifierToken |
1543 | 1563 | select e; |
1544 | | - _sT = d3.Last(); |
| 1564 | + |
| 1565 | + _sT = (SyntaxToken)d3.First(); |
1545 | 1566 | } |
1546 | 1567 |
|
1547 | 1568 | if (_sT.ToString() == node.ToString()) |
@@ -1667,7 +1688,7 @@ where e.Kind() == SyntaxKind.IdentifierToken |
1667 | 1688 | SM.Log(item.ToString()); |
1668 | 1689 | } |
1669 | 1690 |
|
1670 | | - SM.Log("ERROR! By reaching this means, a name did not convert to JS. CHECK FOR UPPERCASE CHARACTERS IN NAMES IN THE JS FILE!"); |
| 1691 | + SM.Log($"ERROR! !-{node}-! By reaching this means, a name did not convert to JS. CHECK FOR UPPERCASE CHARACTERS IN NAMES IN THE JS FILE!"); |
1671 | 1692 |
|
1672 | 1693 | base.VisitIdentifierName(node); |
1673 | 1694 | } |
|
0 commit comments