Skip to content

Commit

Permalink
tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
@PolyProgrammist
PolyProgrammist committed Dec 30, 2023
1 parent 9b0112c commit bc852c5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/codegen/ast.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export type TLBVariable = {
const: boolean
negated: boolean
type: TLBVariableType
name: string
name: string | undefined
deriveExpr?: TLBMathExpr
initialExpr?: TLBMathExpr
isField: boolean
Expand Down
8 changes: 4 additions & 4 deletions src/codegen/generators/typescript/generator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class TypescriptGenerator implements CodeGenerator {
constructor.variables.forEach((variable) => {
if (variable.negated) {
if (variable.deriveExpr) {
if (variable.name == '') {
if (variable.name == undefined) {
throw new Error('')
}
subStructLoadProperties.push(tObjectProperty(tIdentifier(variable.name), convertToAST(variable.deriveExpr, constructor)));
Expand All @@ -77,7 +77,7 @@ export class TypescriptGenerator implements CodeGenerator {

constructor.variables.forEach(variable => {
if (variable.type == '#' && !variable.isField) {
if (variable.name == '') {
if (variable.name == undefined) {
throw new Error('')
}
subStructProperties.push(tTypedIdentifier(tIdentifier(variable.name), tIdentifier('number')));
Expand Down Expand Up @@ -126,7 +126,7 @@ export class TypescriptGenerator implements CodeGenerator {
constructor.parameters.forEach(param => {
if (param.variable.const && !param.variable.negated) {
let argName = param.variable.name;
if (argName == '') {
if (argName == undefined) {
throw new Error('')
}
if (param.argName) {
Expand Down Expand Up @@ -178,7 +178,7 @@ export class TypescriptGenerator implements CodeGenerator {
let anyConstructor = tlbType.constructors[0];
if (anyConstructor) {
anyConstructor.parameters.forEach(element => {
if (element.variable.name == '') {
if (element.variable.name == undefined) {
throw new Error('')
}
if (element.variable.type == 'Type') {
Expand Down
4 changes: 2 additions & 2 deletions src/codegen/generators/typescript/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export function getNegationDerivationFunctionBody(tlbCode: TLBCode, typeName: st
tlbType.constructors.forEach(constructor => {
let parameter = constructor.parameters[parameterIndex];
if (parameter) {
if (parameter.variable.name == '') {
if (parameter.variable.name == undefined) {
throw new Error('')
}
let getExpression: Expression;
Expand Down Expand Up @@ -123,7 +123,7 @@ export function getTypeParametersExpression(parameters: Array<TLBParameter>) {
let structTypeParameters: Array<Identifier> = [];
parameters.forEach(element => {
if (element.variable.type == 'Type') {
if (element.variable.name == '') {
if (element.variable.name == undefined) {
throw new Error('')
}

Expand Down
18 changes: 9 additions & 9 deletions src/codegen/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ export function compareConstructors(a: TLBConstructor, b: TLBConstructor): numbe
}

export function fillParameterNames(tlbType: TLBType) {
let parameterNames: string[] = []
let parameterNames: (string | undefined)[] = []
let argNames: (string | undefined)[] = []
tlbType.constructors[0]?.parameters.forEach(element => {
parameterNames.push(element.variable.name);
argNames.push(undefined);
});
tlbType.constructors.forEach(constructor => {
for (let i = 0; i < constructor.parameters.length; i++) {
if (parameterNames[i] == '') {
if (parameterNames[i] == undefined) {
let parameterName = constructor.parameters[i]?.variable.name;
if (parameterName != undefined) {
parameterNames[i] = parameterName;
Expand All @@ -207,14 +207,14 @@ export function fillParameterNames(tlbType: TLBType) {
}
});
for (let i = 0; i < parameterNames.length; i++) {
if (parameterNames[i] == '') {
if (parameterNames[i] == undefined) {
parameterNames[i] = 'arg' + i;
}
}
tlbType.constructors.forEach(constructor => {
for (let i = 0; i < constructor.parameters.length; i++) {
let parameterName = parameterNames[i]
if (parameterName != undefined && constructor.parameters[i]?.variable.name == '') {
if (parameterName != undefined && constructor.parameters[i]?.variable.name == undefined) {
constructor.parameters[i]!.variable.name = parameterName;
}
let argName = argNames[i];
Expand Down Expand Up @@ -467,7 +467,7 @@ export function fillConstructors(declarations: Declaration[], tlbCode: TLBCode,
fieldIndex++;
})
constructor.variables.forEach(variable => {
if (variable.name == '') {
if (variable.name == undefined) {
throw new Error('')
}
constructor.variablesMap.set(variable.name, variable);
Expand Down Expand Up @@ -497,7 +497,7 @@ export function fillConstructors(declarations: Declaration[], tlbCode: TLBCode,
if (variable) {
parameter = { variable: variable, paramExpr: derivedExpr.derived };
parameter.argName = 'arg' + argumentIndex;
if (parameter.variable.name == '') {
if (parameter.variable.name == undefined) {
throw new Error('')
}
parameter.variable.deriveExpr = reorganizeWithArg(convertToMathExpr(element), parameter.argName, parameter.variable.name);
Expand All @@ -514,7 +514,7 @@ export function fillConstructors(declarations: Declaration[], tlbCode: TLBCode,

if (derivedExpr.name == undefined) {
if (toBeConst) {
parameter = { variable: { negated: true, const: toBeConst, type: '#', name: '', deriveExpr: derivedExpr.derived, initialExpr: derivedExpr.derived, calculated: false, isField: false }, paramExpr: derivedExpr.derived };
parameter = { variable: { negated: true, const: toBeConst, type: '#', name: undefined, deriveExpr: derivedExpr.derived, initialExpr: derivedExpr.derived, calculated: false, isField: false }, paramExpr: derivedExpr.derived };
} else {
throw new Error('Cannot identify combinator arg ' + element)
}
Expand All @@ -530,12 +530,12 @@ export function fillConstructors(declarations: Declaration[], tlbCode: TLBCode,
}
}
} else if (element instanceof NumberExpr) {
parameter = { variable: { negated: false, const: true, type: '#', name: '', deriveExpr: new TLBNumberExpr(element.num), initialExpr: new TLBNumberExpr(element.num), calculated: false, isField: false }, paramExpr: new TLBNumberExpr(element.num) }
parameter = { variable: { negated: false, const: true, type: '#', name: undefined, deriveExpr: new TLBNumberExpr(element.num), initialExpr: new TLBNumberExpr(element.num), calculated: false, isField: false }, paramExpr: new TLBNumberExpr(element.num) }
} else {
throw new Error('Cannot identify combinator arg: ' + element)
}
constructor.parameters.push(parameter);
if (parameter.variable.name != '') {
if (parameter.variable.name != undefined) {
constructor.parametersMap.set(parameter.variable.name, parameter);
}
});
Expand Down

0 comments on commit bc852c5

Please sign in to comment.