Skip to content

Commit 26044dc

Browse files
committed
Rename ns.iflet to res.iflet
1 parent 3cccb5a commit 26044dc

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49873,7 +49873,7 @@ let filterParsingAttrs attrs =
4987349873
match attr with
4987449874
| ( {
4987549875
Location.txt =
49876-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "ns.namedArgLoc"
49876+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "ns.namedArgLoc"
4987749877
| "res.optional" | "res.ternary" | "res.async" | "res.await"
4987849878
| "res.template" );
4987949879
},
@@ -50000,7 +50000,7 @@ let flattenableOperators parentOperator childOperator =
5000050000
let rec hasIfLetAttribute attrs =
5000150001
match attrs with
5000250002
| [] -> false
50003-
| ({Location.txt = "ns.iflet"}, _) :: _ -> true
50003+
| ({Location.txt = "res.iflet"}, _) :: _ -> true
5000450004
| _ :: attrs -> hasIfLetAttribute attrs
5000550005

5000650006
let isIfLetExpr expr =
@@ -50022,7 +50022,7 @@ let hasAttributes attrs =
5002250022
match attr with
5002350023
| ( {
5002450024
Location.txt =
50025-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "res.ternary"
50025+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "res.ternary"
5002650026
| "res.async" | "res.await" | "res.template" );
5002750027
},
5002850028
_ ) ->
@@ -50204,7 +50204,7 @@ let isPrintableAttribute attr =
5020450204
match attr with
5020550205
| ( {
5020650206
Location.txt =
50207-
( "bs" | "res.uapp" | "ns.iflet" | "res.braces" | "JSX" | "res.async"
50207+
( "bs" | "res.uapp" | "res.iflet" | "res.braces" | "JSX" | "res.async"
5020850208
| "res.await" | "res.template" | "res.ternary" );
5020950209
},
5021050210
_ ) ->

lib/4.06.1/unstable/js_playground_compiler.ml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49873,7 +49873,7 @@ let filterParsingAttrs attrs =
4987349873
match attr with
4987449874
| ( {
4987549875
Location.txt =
49876-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "ns.namedArgLoc"
49876+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "ns.namedArgLoc"
4987749877
| "res.optional" | "res.ternary" | "res.async" | "res.await"
4987849878
| "res.template" );
4987949879
},
@@ -50000,7 +50000,7 @@ let flattenableOperators parentOperator childOperator =
5000050000
let rec hasIfLetAttribute attrs =
5000150001
match attrs with
5000250002
| [] -> false
50003-
| ({Location.txt = "ns.iflet"}, _) :: _ -> true
50003+
| ({Location.txt = "res.iflet"}, _) :: _ -> true
5000450004
| _ :: attrs -> hasIfLetAttribute attrs
5000550005

5000650006
let isIfLetExpr expr =
@@ -50022,7 +50022,7 @@ let hasAttributes attrs =
5002250022
match attr with
5002350023
| ( {
5002450024
Location.txt =
50025-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "res.ternary"
50025+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "res.ternary"
5002650026
| "res.async" | "res.await" | "res.template" );
5002750027
},
5002850028
_ ) ->
@@ -50204,7 +50204,7 @@ let isPrintableAttribute attr =
5020450204
match attr with
5020550205
| ( {
5020650206
Location.txt =
50207-
( "bs" | "res.uapp" | "ns.iflet" | "res.braces" | "JSX" | "res.async"
50207+
( "bs" | "res.uapp" | "res.iflet" | "res.braces" | "JSX" | "res.async"
5020850208
| "res.await" | "res.template" | "res.ternary" );
5020950209
},
5021050210
_ ) ->
@@ -162142,7 +162142,7 @@ end
162142162142
let jsxAttr = (Location.mknoloc "JSX", Parsetree.PStr [])
162143162143
let uncurriedAppAttr = (Location.mknoloc "res.uapp", Parsetree.PStr [])
162144162144
let ternaryAttr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
162145-
let ifLetAttr = (Location.mknoloc "ns.iflet", Parsetree.PStr [])
162145+
let ifLetAttr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
162146162146
let optionalAttr = (Location.mknoloc "res.optional", Parsetree.PStr [])
162147162147
let makeAwaitAttr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
162148162148
let makeAsyncAttr loc = (Location.mkloc "res.async" loc, Parsetree.PStr [])

lib/4.06.1/whole_compiler.ml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104867,7 +104867,7 @@ let filterParsingAttrs attrs =
104867104867
match attr with
104868104868
| ( {
104869104869
Location.txt =
104870-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "ns.namedArgLoc"
104870+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "ns.namedArgLoc"
104871104871
| "res.optional" | "res.ternary" | "res.async" | "res.await"
104872104872
| "res.template" );
104873104873
},
@@ -104994,7 +104994,7 @@ let flattenableOperators parentOperator childOperator =
104994104994
let rec hasIfLetAttribute attrs =
104995104995
match attrs with
104996104996
| [] -> false
104997-
| ({Location.txt = "ns.iflet"}, _) :: _ -> true
104997+
| ({Location.txt = "res.iflet"}, _) :: _ -> true
104998104998
| _ :: attrs -> hasIfLetAttribute attrs
104999104999

105000105000
let isIfLetExpr expr =
@@ -105016,7 +105016,7 @@ let hasAttributes attrs =
105016105016
match attr with
105017105017
| ( {
105018105018
Location.txt =
105019-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "res.ternary"
105019+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "res.ternary"
105020105020
| "res.async" | "res.await" | "res.template" );
105021105021
},
105022105022
_ ) ->
@@ -105198,7 +105198,7 @@ let isPrintableAttribute attr =
105198105198
match attr with
105199105199
| ( {
105200105200
Location.txt =
105201-
( "bs" | "res.uapp" | "ns.iflet" | "res.braces" | "JSX" | "res.async"
105201+
( "bs" | "res.uapp" | "res.iflet" | "res.braces" | "JSX" | "res.async"
105202105202
| "res.await" | "res.template" | "res.ternary" );
105203105203
},
105204105204
_ ) ->
@@ -175574,7 +175574,7 @@ end
175574175574
let jsxAttr = (Location.mknoloc "JSX", Parsetree.PStr [])
175575175575
let uncurriedAppAttr = (Location.mknoloc "res.uapp", Parsetree.PStr [])
175576175576
let ternaryAttr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
175577-
let ifLetAttr = (Location.mknoloc "ns.iflet", Parsetree.PStr [])
175577+
let ifLetAttr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
175578175578
let optionalAttr = (Location.mknoloc "res.optional", Parsetree.PStr [])
175579175579
let makeAwaitAttr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
175580175580
let makeAsyncAttr loc = (Location.mkloc "res.async" loc, Parsetree.PStr [])

res_syntax/src/res_core.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ end
150150
let jsxAttr = (Location.mknoloc "JSX", Parsetree.PStr [])
151151
let uncurriedAppAttr = (Location.mknoloc "res.uapp", Parsetree.PStr [])
152152
let ternaryAttr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
153-
let ifLetAttr = (Location.mknoloc "ns.iflet", Parsetree.PStr [])
153+
let ifLetAttr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
154154
let optionalAttr = (Location.mknoloc "res.optional", Parsetree.PStr [])
155155
let makeAwaitAttr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
156156
let makeAsyncAttr loc = (Location.mkloc "res.async" loc, Parsetree.PStr [])

res_syntax/src/res_parsetree_viewer.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ let filterParsingAttrs attrs =
208208
match attr with
209209
| ( {
210210
Location.txt =
211-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "ns.namedArgLoc"
211+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "ns.namedArgLoc"
212212
| "res.optional" | "res.ternary" | "res.async" | "res.await"
213213
| "res.template" );
214214
},
@@ -335,7 +335,7 @@ let flattenableOperators parentOperator childOperator =
335335
let rec hasIfLetAttribute attrs =
336336
match attrs with
337337
| [] -> false
338-
| ({Location.txt = "ns.iflet"}, _) :: _ -> true
338+
| ({Location.txt = "res.iflet"}, _) :: _ -> true
339339
| _ :: attrs -> hasIfLetAttribute attrs
340340

341341
let isIfLetExpr expr =
@@ -357,7 +357,7 @@ let hasAttributes attrs =
357357
match attr with
358358
| ( {
359359
Location.txt =
360-
( "bs" | "res.uapp" | "res.braces" | "ns.iflet" | "res.ternary"
360+
( "bs" | "res.uapp" | "res.braces" | "res.iflet" | "res.ternary"
361361
| "res.async" | "res.await" | "res.template" );
362362
},
363363
_ ) ->
@@ -539,7 +539,7 @@ let isPrintableAttribute attr =
539539
match attr with
540540
| ( {
541541
Location.txt =
542-
( "bs" | "res.uapp" | "ns.iflet" | "res.braces" | "JSX" | "res.async"
542+
( "bs" | "res.uapp" | "res.iflet" | "res.braces" | "JSX" | "res.async"
543543
| "res.await" | "res.template" | "res.ternary" );
544544
},
545545
_ ) ->

res_syntax/tests/parsing/errors/expressions/expected/ifLet.res.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ switch result {
3636
}
3737

3838
;;((match result with | Some x -> Js.log {js|The sky is blue|js} | _ -> ())
39-
[@ns.iflet ][@warning "-4"])
39+
[@res.iflet ][@warning "-4"])
4040
;;((match result with
4141
| Error x -> Js.log {js|The sky is red|js}
4242
| _ ->
4343
(((match result with
4444
| Ok y -> Js.log {js|The sky is blue|js}
4545
| _ -> ()))
46-
[@ns.iflet ][@warning "-4"]))[@ns.iflet ][@warning "-4"])
46+
[@res.iflet ][@warning "-4"]))[@res.iflet ][@warning "-4"])

0 commit comments

Comments
 (0)