Change enter/exit marker with arrows

Author: SeungheonOh

plutus-core/executables/traceToStacks/Common.hs

@@ -65,8 +65,8 @@ parseProfileEvent valIx (LogRow str vals) =
   in case words str of
     [transition,var] ->
       case transition of
-        "entering" -> MkProfileEvent val Enter (T.pack var)
-        "exiting" -> MkProfileEvent val Exit (T.pack var)
+        "->" -> MkProfileEvent val Enter (T.pack var)
+        "<-" -> MkProfileEvent val Exit (T.pack var)
         badLog -> error $
           "parseProfileEvent: expecting \"entering\" or \"exiting\" but got "
           <> show badLog
@@ -105,4 +105,3 @@ getStacks = go []
     go [] [] = []
     go stacks [] = error $
       "getStacks; go: stack " <> show stacks <> " isn't empty but the log is."
-

plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/EmitterMode.hs

@@ -75,8 +75,8 @@ logWithBudgetEmitter = EmitterMode $ \getBudget -> do
 
 This requires script to be compiled with `PlutusTx.Plugin:profile-all` turned on because this relies
 on compiler-generated trace calls that notifies entrance and exit of a function call. These traces
-that mark entrance and exit are ordinary traces like "entering rob:Example.hs:3:1-3:15" and "exiting
-bob:Example.hs:1:1-1:13" with "entering" and "exiting" prefixies, where "bob" and "rob" is the name
+that mark entrance and exit are ordinary traces like "-> rob:Example.hs:3:1-3:15" and "<-
+bob:Example.hs:1:1-1:13" with "->" and "<-" prefixies, where "bob" and "rob" is the name
 of the function with source span. If regular script with no entrance/exit marker is given, this
 emitter will behave identically to 'logEmitter'.
 
@@ -97,8 +97,8 @@ logWithCallTraceEmitter = EmitterMode $ \_ -> do
         go [] l = l
         go (x:xs) l =
           case (T.words (last l), T.words x) of
-            ("entering":enterRest, "exiting":exitRest) | enterRest == exitRest -> go xs (init l)
-            _                                                                  -> go xs (l <> [x])
+            ("->":enterRest, "<-":exitRest) | enterRest == exitRest -> go xs (init l)
+            _                                                       -> go xs (l <> [x])
 
     emitter logs = CekM $ modifySTRef logsRef (addTrace logs)
   pure $ CekEmitterInfo emitter (DList.toList <$> readSTRef logsRef)

plutus-tx-plugin/plutus-tx-plugin.cabal

@@ -136,9 +136,9 @@ test-suite plutus-tx-plugin-tests
     BuiltinList.Budget.Spec
     ByteStringLiterals.Lib
     ByteStringLiterals.Spec
+    CallTrace.Lib
     CallTrace.OtherModule
     CallTrace.Spec
-    CallTrace.Utils
     DataList.Budget.Spec
     Inline.Spec
     IntegerLiterals.NoStrict.NegativeLiterals.Spec

plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs

@@ -791,9 +791,9 @@ entryExitTracing lamName displayName e ty =
         annMayInline
         ( mkTrace
             (PLC.TyFun annMayInline defaultUnitTy ty) -- ()-> ty
-            ("entering " <> displayName)
+            ("-> " <> displayName)
             -- \() -> trace @c "exiting f" e
-            (LamAbs annMayInline lamName defaultUnitTy (mkTrace ty ("exiting " <> displayName) e))
+            (LamAbs annMayInline lamName defaultUnitTy (mkTrace ty ("<- " <> displayName) e))
         )
         defaultUnit
 

plutus-tx-plugin/test/CallTrace/9.6/func01.eval.golden

@@ -3,10 +3,10 @@ The machine terminated because of an error, either from a built-in function or f
 Caused by: error
 
 Trace:
-entering func:test/CallTrace/Spec.hs:69:1-69:4
+-> func:test/CallTrace/Spec.hs:78:1-78:4
 func 1
-entering nestedLinear:test/CallTrace/Spec.hs:62:1-62:12
-entering nestedLinear2:test/CallTrace/Spec.hs:63:1-63:13
-entering nestedLinear3:test/CallTrace/Spec.hs:64:1-64:13
-entering nestedLinear4:test/CallTrace/Spec.hs:65:1-65:13
-entering error
+-> nestedLinear:test/CallTrace/Spec.hs:71:1-71:12
+-> nestedLinear2:test/CallTrace/Spec.hs:72:1-72:13
+-> nestedLinear3:test/CallTrace/Spec.hs:73:1-73:13
+-> nestedLinear4:test/CallTrace/Spec.hs:74:1-74:13
+-> error

plutus-tx-plugin/test/CallTrace/9.6/func02.eval.golden

@@ -3,8 +3,8 @@ The machine terminated because of an error, either from a built-in function or f
 Caused by: error
 
 Trace:
-entering func:test/CallTrace/Spec.hs:69:1-69:4
-entering nestedLinear2:test/CallTrace/Spec.hs:63:1-63:13
-entering nestedLinear3:test/CallTrace/Spec.hs:64:1-64:13
-entering nestedLinear4:test/CallTrace/Spec.hs:65:1-65:13
-entering error
+-> func:test/CallTrace/Spec.hs:78:1-78:4
+-> nestedLinear2:test/CallTrace/Spec.hs:72:1-72:13
+-> nestedLinear3:test/CallTrace/Spec.hs:73:1-73:13
+-> nestedLinear4:test/CallTrace/Spec.hs:74:1-74:13
+-> error

plutus-tx-plugin/test/CallTrace/9.6/func03.eval.golden

@@ -3,6 +3,7 @@ The machine terminated because of an error, either from a built-in function or f
 Caused by: error
 
 Trace:
-entering func:test/CallTrace/Spec.hs:69:1-69:4
-entering functionFromOtherModule:test/CallTrace/Spec.hs:84:1-84:23
-entering errorWhenTrue:test/CallTrace/OtherModule.hs:9:1-9:13
+-> func:test/CallTrace/Spec.hs:78:1-78:4
+-> functionFromOtherModule:test/CallTrace/Spec.hs:93:1-93:23
+-> $
+-> errorWhenTrue:test/CallTrace/OtherModule.hs:9:1-9:13

plutus-tx-plugin/test/CallTrace/9.6/func04.eval.golden

@@ -3,6 +3,6 @@ The machine terminated because of an error, either from a built-in function or f
 Caused by: error
 
 Trace:
-entering func:test/CallTrace/Spec.hs:69:1-69:4
-entering $cmyClassFunc:test/CallTrace/Spec.hs:90:3-90:13
-entering error
+-> func:test/CallTrace/Spec.hs:78:1-78:4
+-> $cmyClassFunc:test/CallTrace/Spec.hs:99:3-99:13
+-> error

plutus-tx-plugin/test/CallTrace/9.6/func05.eval.golden

@@ -3,7 +3,8 @@ The machine terminated because of an error, either from a built-in function or f
 Caused by: error
 
 Trace:
-entering func:test/CallTrace/Spec.hs:69:1-69:4
-entering $cmyClassFunc:test/CallTrace/Spec.hs:90:3-90:13
-entering functionFromOtherModule:test/CallTrace/Spec.hs:84:1-84:23
-entering errorWhenTrue:test/CallTrace/OtherModule.hs:9:1-9:13
+-> func:test/CallTrace/Spec.hs:78:1-78:4
+-> $cmyClassFunc:test/CallTrace/Spec.hs:99:3-99:13
+-> functionFromOtherModule:test/CallTrace/Spec.hs:93:1-93:23
+-> $
+-> errorWhenTrue:test/CallTrace/OtherModule.hs:9:1-9:13

plutus-tx-plugin/test/CallTrace/9.6/func06.eval.golden

@@ -3,6 +3,6 @@ The machine terminated because of an error, either from a built-in function or f
 Caused by: error
 
 Trace:
-entering func:test/CallTrace/Spec.hs:69:1-69:4
-entering $cmyClassFunc:test/CallTrace/Spec.hs:94:3-94:13
-entering error
+-> func:test/CallTrace/Spec.hs:78:1-78:4
+-> $cmyClassFunc:test/CallTrace/Spec.hs:103:3-103:13
+-> error