Skip to content

Commit e25f16f

Browse files
committed
Tidy a little
1 parent 44abcb2 commit e25f16f

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/Compiler/Checking/CheckExpressions.fs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5468,12 +5468,11 @@ and TcExprUndelayed (cenv: cenv) (overallTy: OverallTy) env tpenv (synExpr: SynE
54685468
CallExprHasTypeSink cenv.tcSink (m, env.NameEnv, overallTy.Commit, env.AccessRights)
54695469
TcConstExpr cenv overallTy env m tpenv synConst
54705470
| SynExpr.DotLambda (synExpr, m) ->
5471-
let unitVar = mkSynId m "unitVar"
5472-
let svar = mkSynCompGenSimplePatVar unitVar
5473-
let pushedExpr = pushUnitArg synExpr unitVar
5471+
let unaryArg = mkSynId m (cenv.synArgNameGenerator.New())
5472+
let svar = mkSynCompGenSimplePatVar unaryArg
5473+
let pushedExpr = pushUnaryArg synExpr unaryArg
54745474
let lambda = SynExpr.Lambda(false, false, SynSimplePats.SimplePats([ svar ], m), pushedExpr, None, m, SynExprLambdaTrivia.Zero)
54755475
TcIteratedLambdas cenv true env overallTy Set.empty tpenv lambda
5476-
// TcIteratedLambda
54775476
| SynExpr.Lambda _ ->
54785477
TcIteratedLambdas cenv true env overallTy Set.empty tpenv synExpr
54795478

src/Compiler/SyntaxTree/SyntaxTreeOps.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ let mkSynSimplePatVar isOpt id =
6363
let mkSynCompGenSimplePatVar id =
6464
SynSimplePat.Id(id, None, true, false, false, id.idRange)
6565

66-
let rec pushUnitArg expr arg =
66+
let rec pushUnaryArg expr arg =
6767
match expr with
6868
| SynExpr.App (ExprAtomicFlag.Atomic, infix, SynExpr.Ident ident, x1, m1) ->
6969
SynExpr.App(
@@ -86,17 +86,17 @@ let rec pushUnitArg expr arg =
8686
m1
8787
)
8888
| SynExpr.App (ExprAtomicFlag.Atomic, infix, (SynExpr.App (_) as innerApp), x1, m1) ->
89-
SynExpr.App(ExprAtomicFlag.Atomic, infix, (pushUnitArg innerApp arg), x1, m1)
89+
SynExpr.App(ExprAtomicFlag.Atomic, infix, (pushUnaryArg innerApp arg), x1, m1)
9090
| SynExpr.App (ExprAtomicFlag.Atomic, infix, SynExpr.DotGet (synExpr, rangeOfDot, synLongIdent, range), x1, m1) ->
91-
SynExpr.App(ExprAtomicFlag.Atomic, infix, SynExpr.DotGet((pushUnitArg synExpr arg), rangeOfDot, synLongIdent, range), x1, m1)
91+
SynExpr.App(ExprAtomicFlag.Atomic, infix, SynExpr.DotGet((pushUnaryArg synExpr arg), rangeOfDot, synLongIdent, range), x1, m1)
9292
| SynExpr.App (ExprAtomicFlag.Atomic, infix, innerExpr, x1, m1) ->
93-
SynExpr.App(ExprAtomicFlag.Atomic, infix, pushUnitArg innerExpr arg, x1, m1)
93+
SynExpr.App(ExprAtomicFlag.Atomic, infix, pushUnaryArg innerExpr arg, x1, m1)
9494
| SynExpr.Ident ident -> SynExpr.LongIdent(false, SynLongIdent(arg :: ident :: [], [ ident.idRange ], [ None ]), None, ident.idRange)
9595
| SynExpr.LongIdent (isOptional, SynLongIdent (id, dotRanges, trivia), altNameRefCell, range) ->
9696
SynExpr.LongIdent(isOptional, SynLongIdent(arg :: id, dotRanges, trivia), altNameRefCell, range)
97-
| SynExpr.DotGet (synExpr, rangeOfDot, synLongIdent, range) -> SynExpr.DotGet(pushUnitArg synExpr arg, rangeOfDot, synLongIdent, range)
97+
| SynExpr.DotGet (synExpr, rangeOfDot, synLongIdent, range) -> SynExpr.DotGet(pushUnaryArg synExpr arg, rangeOfDot, synLongIdent, range)
9898
| SynExpr.DotIndexedGet (objectExpr, indexArgs, dotRange, range) ->
99-
SynExpr.DotIndexedGet(pushUnitArg objectExpr arg, indexArgs, dotRange, range)
99+
SynExpr.DotIndexedGet(pushUnaryArg objectExpr arg, indexArgs, dotRange, range)
100100
| _ -> expr
101101
// | SynExpr.App(ExprAtomicFlag.Atomic, infix, innerExpr, x1, m1)
102102
let (|SynSingleIdent|_|) x =

src/Compiler/SyntaxTree/SyntaxTreeOps.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ val mkSynSimplePatVar: isOpt: bool -> id: Ident -> SynSimplePat
4141

4242
val mkSynCompGenSimplePatVar: id: Ident -> SynSimplePat
4343

44-
val pushUnitArg: expr: SynExpr -> arg: Ident -> SynExpr
44+
val pushUnaryArg: expr: SynExpr -> arg: Ident -> SynExpr
4545

4646
/// Match a long identifier, including the case for single identifiers which gets a more optimized node in the syntax tree.
4747
val (|LongOrSingleIdent|_|):

0 commit comments

Comments
 (0)