mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #62 from dukefirehawk/fix-bug/jael

Browse source 
Fixed JAEL
This commit is contained in:
Thomas Hii 2022-04-24 19:09:53 +08:00 committed by GitHub
commit 2ed19c08cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 397 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/jael/angel_jael/CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Change Log # Change Log
## 6.0.1
* Updated `jael3`
* Updated `jael_preprocessor`
## 6.0.0 ## 6.0.0
* Updated to SDK 2.16.x * Updated to SDK 2.16.x

2
packages/jael/angel_jael/pubspec.yaml
View file

@ -1,5 +1,5 @@
name: angel3_jael name: angel3_jael
version: 6.0.0 version: 6.0.1
description: Angel support for the Jael templating engine, similar to Blade or Liquid. description: Angel support for the Jael templating engine, similar to Blade or Liquid.
homepage: https://angel3-framework.web.app/ homepage: https://angel3-framework.web.app/
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/angel_jael repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/angel_jael

4
packages/jael/jael/CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Change Log # Change Log
## 6.0.1
* Fixed analyze errors
## 6.0.0 ## 6.0.0
* Updated to SDK 2.16.x * Updated to SDK 2.16.x

3
packages/jael/jael/lib/src/ast/map.dart
View file

@ -13,7 +13,8 @@ class MapLiteral extends Literal {
@override @override
Map compute(scope) { Map compute(scope) {
return pairs.fold<Map>({}, (out, p) { return pairs.fold<Map>({}, (out, p) {
var key, value; dynamic key;
dynamic value;
if (p.colon == null) { if (p.colon == null) {
if (p.key is! Identifier) { if (p.key is! Identifier) {

2
packages/jael/jael/lib/src/ast/string.dart
View file

@ -2,8 +2,6 @@ import 'package:charcode/charcode.dart';
import 'package:source_span/source_span.dart'; import 'package:source_span/source_span.dart';
import 'package:belatuk_symbol_table/belatuk_symbol_table.dart'; import 'package:belatuk_symbol_table/belatuk_symbol_table.dart';
import '../ast/ast.dart'; import '../ast/ast.dart';
import 'expression.dart';
import 'token.dart';
class StringLiteral extends Literal { class StringLiteral extends Literal {
final Token string; final Token string;

2
packages/jael/jael/lib/src/ast/token.dart
View file

@ -49,7 +49,7 @@ enum TokenType {
plus, plus,
minus, minus,
elvis, elvis,
elvis_dot, elvisDot,
lte, lte,
gte, gte,
equ, equ,

2
packages/jael/jael/lib/src/text/parselet/infix.dart
View file

@ -2,7 +2,7 @@ part of jael.src.text.parselet;
const Map<TokenType, InfixParselet> infixParselets = { const Map<TokenType, InfixParselet> infixParselets = {
TokenType.lParen: CallParselet(), TokenType.lParen: CallParselet(),
TokenType.elvis_dot: MemberParselet(), TokenType.elvisDot: MemberParselet(),
TokenType.dot: MemberParselet(), TokenType.dot: MemberParselet(),
TokenType.lBracket: IndexerParselet(), TokenType.lBracket: IndexerParselet(),
TokenType.asterisk: BinaryParselet(14), TokenType.asterisk: BinaryParselet(14),

2
packages/jael/jael/lib/src/text/scanner.dart
View file

@ -54,7 +54,7 @@ final Map<Pattern, TokenType> _expressionPatterns = {
',': TokenType.comma, ',': TokenType.comma,
'.': TokenType.dot, '.': TokenType.dot,
'??': TokenType.elvis, '??': TokenType.elvis,
'?.': TokenType.elvis_dot, '?.': TokenType.elvisDot,
//'=': TokenType.equals, //'=': TokenType.equals,
'!': TokenType.exclamation, '!': TokenType.exclamation,
'-': TokenType.minus, '-': TokenType.minus,

2
packages/jael/jael/pubspec.yaml
View file

@ -1,5 +1,5 @@
name: jael3 name: jael3
version: 6.0.0 version: 6.0.1
description: A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid. description: A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid.
homepage: https://angel3-framework.web.app/ homepage: https://angel3-framework.web.app/
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael

4
packages/jael/jael_preprocessor/CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Change Log # Change Log
## 6.0.1
* Fixed `jael3` version
## 6.0.0 ## 6.0.0
* Updated to SDK 2.16.x * Updated to SDK 2.16.x

4
packages/jael/jael_preprocessor/pubspec.yaml
View file

@ -1,5 +1,5 @@
name: jael3_preprocessor name: jael3_preprocessor
version: 6.0.0 version: 6.0.1
description: A pre-processor for resolving blocks and includes within Jael templates. description: A pre-processor for resolving blocks and includes within Jael templates.
homepage: https://angel3-framework.web.app/ homepage: https://angel3-framework.web.app/
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor
@ -7,7 +7,7 @@ environment:
sdk: '>=2.16.0 <3.0.0' sdk: '>=2.16.0 <3.0.0'
dependencies: dependencies:
file: ^6.1.0 file: ^6.1.0
jael3: ^5.0.0 jael3: ^6.0.0
belatuk_symbol_table: ^3.0.0 belatuk_symbol_table: ^3.0.0
collection: ^1.15.0 collection: ^1.15.0
dev_dependencies: dev_dependencies:

500
packages/jael/jael_web/lib/src/elements.dart
View file

File diff suppressed because it is too large Load diff