WIP

NixOS · Jul 8, 2024 · e96fd4e · e96fd4e
1 parent fd4b17a
commit e96fd4e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
@@ -29,6 +29,8 @@ namespace nix {
 
 #define CUR_POS state->at(*yylloc)
 
+static std::string currentDocCommentText;
+
 static void initLoc(YYLTYPE * loc)
 {
     loc->first_line = loc->last_line = 0;
@@ -279,6 +281,15 @@ or          { return OR_KW; }
 {SPATH}     { yylval->path = {yytext, (size_t) yyleng}; return SPATH; }
 {URI}       { yylval->uri = {yytext, (size_t) yyleng}; return URI; }
 
+\/\*\*([^*]|\*+[^*/])*\*+\/  /* long comments */ {
+    // TODO: alternate, scalable approach:
+    // // save doc comment
+    // currentDocCommentText = std::string(yytext, yyleng);
+    // return DOC_COMMENT;
+    return new DocComment(std::string(yytext, yyleng));
+}
+
+
 [ \t\r\n]+    /* eat up whitespace */
 \#[^\r\n]*    /* single-line comments */
 \/\*([^*]|\*+[^*/])*\*+\/  /* long comments */

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
@@ -22,6 +22,10 @@ struct ExprWith;
 struct StaticEnv;
 
 
+struct DocComment {
+    std::string innerText;
+};
+
 /**
  * An attribute path is a sequence of attribute names.
  */
@@ -54,6 +58,7 @@ struct Expr
     virtual ~Expr() { };
     virtual void show(const SymbolTable & symbols, std::ostream & str) const;
     virtual void bindVars(EvalState & es, const std::shared_ptr<const StaticEnv> & env);
+    virtual void pushDocComment(const DocComment & docComment) { };
     virtual void eval(EvalState & state, Env & env, Value & v);
     virtual Value * maybeThunk(EvalState & state, Env & env);
     virtual void setName(Symbol name);
@@ -188,6 +193,10 @@ struct ExprAttrs : Expr
         Kind kind;
         Expr * e;
         PosIdx pos;
+        /**
+         * noPos pretty often
+         */
+        PosIdx docStartPos;
         Displacement displ; // displacement
         AttrDef(Expr * e, const PosIdx & pos, Kind kind = Kind::Plain)
             : kind(kind), e(e), pos(pos) { };

diff --git a/src/libexpr/parser-state.hh b/src/libexpr/parser-state.hh
@@ -50,7 +50,7 @@ struct ParserState
 
     void dupAttr(const AttrPath & attrPath, const PosIdx pos, const PosIdx prevPos);
     void dupAttr(Symbol attr, const PosIdx pos, const PosIdx prevPos);
-    void addAttr(ExprAttrs * attrs, AttrPath && attrPath, Expr * e, const PosIdx pos);
+    void addAttr(ExprAttrs * attrs, AttrPath && attrPath, Expr * e, const PosIdx pos, const DocComment & docComment);
     Formals * validateFormals(Formals * formals, PosIdx pos = noPos, Symbol arg = {});
     Expr * stripIndentation(const PosIdx pos,
         std::vector<std::pair<PosIdx, std::variant<Expr *, StringToken>>> && es);
@@ -74,7 +74,7 @@ inline void ParserState::dupAttr(Symbol attr, const PosIdx pos, const PosIdx pre
     });
 }
 
-inline void ParserState::addAttr(ExprAttrs * attrs, AttrPath && attrPath, Expr * e, const PosIdx pos)
+inline void ParserState::addAttr(ExprAttrs * attrs, AttrPath && attrPath, Expr * e, const PosIdx pos, const DocComment & docComment)
 {
     AttrPath::iterator i;
     // All attrpaths have at least one attr

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
@@ -94,6 +94,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParserState * state, const char *
   std::vector<std::pair<nix::AttrName, nix::PosIdx>> * inheritAttrs;
   std::vector<std::pair<nix::PosIdx, nix::Expr *>> * string_parts;
   std::vector<std::pair<nix::PosIdx, std::variant<nix::Expr *, nix::StringToken>>> * ind_string_parts;
+  nix::DocComment * docComment;
 }
 
 %type <e> start expr expr_function expr_if expr_op
@@ -118,6 +119,9 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParserState * state, const char *
 %token DOLLAR_CURLY /* == ${ */
 %token IND_STRING_OPEN IND_STRING_CLOSE
 %token ELLIPSIS
+%token <docComment> DOC_COMMENT
+%type <docComment> doc_comment_maybe
+//%type <docComment> docComment
 
 %right IMPL
 %left OR
@@ -311,8 +315,18 @@ ind_string_parts
   | { $$ = new std::vector<std::pair<PosIdx, std::variant<Expr *, StringToken>>>; }
   ;
 
+doc_comment_maybe
+  : DOC_COMMENT { return $1; }
+  | { return nullptr; }
+  ;
+
 binds
-  : binds attrpath '=' expr ';' { $$ = $1; state->addAttr($$, std::move(*$2), $4, state->at(@2)); delete $2; }
+  : binds doc_comment_maybe attrpath '=' expr ';' {
+      $$ = $1;
+      $5->pushDocComment($2);
+      state->addAttr($$, std::move(*$3), $5, state->at(@3));
+      delete $3;
+    }
   | binds INHERIT attrs ';'
     { $$ = $1;
       for (auto & [i, iPos] : *$3) {