No longer strip comments and ";" from description

Author: hknutzen

go/pkg/parser/parser.go

@@ -358,11 +358,10 @@ func (p *parser) description() *ast.Description {
 	preCmt := p.readPreCmt("")
 	if p.check("description") {
 		p.expectLeave("=")
-		p.pos, p.tok = p.scanner.ToEOLorComment()
+		p.pos, p.tok = p.scanner.ToEOL()
 		a := new(ast.Description)
-		a.Text = p.tok
+		a.Text = strings.TrimSpace(p.tok)
 		a.SetPreComment(preCmt)
-		a.SetPostComment(p.readPostCmtAfter(""))
 		p.next()
 		return a
 	}

go/pkg/pass1/setup-objects.go

@@ -2389,7 +2389,7 @@ func (c *spoc) setupService(v *ast.Service) {
 	sv := c.symTable.service[sName]
 	sv.name = name
 	if d := v.Description; d != nil {
-		sv.description = strings.TrimSuffix(strings.TrimSpace(d.Text), ";")
+		sv.description = d.Text
 	}
 	for _, a := range v.Attributes {
 		switch a.Name {

go/pkg/scanner/scanner.go

@@ -254,11 +254,3 @@ func (s *Scanner) ToEOL() (int, string) {
 	}
 	return pos, string(s.src[pos:s.offset])
 }
-
-func (s *Scanner) ToEOLorComment() (int, string) {
-	pos := s.offset
-	for s.ch != '\n' && s.ch != '#' && s.ch >= 0 {
-		s.next()
-	}
-	return pos, string(s.src[pos:s.offset])
-}

go/testdata/cut-netspoc/cut-netspoc.t

@@ -3083,7 +3083,7 @@ service:s = {
 }
 =OUTPUT=
 network:n1 = {
- description = network:n1
+ description = network:n1; # looks like code
  ip = 10.1.1.0/24;
 }
 network:n2 = { ip = 10.1.2.0/24; }

go/testdata/export-netspoc/export.t

@@ -2124,7 +2124,7 @@ service:s1 = {
 {
  "s1": {
   "details": {
-   "description": "test; test, test",
+   "description": "test; test, test;# With comment",
    "owner": [
     ":unknown"
    ]

go/testdata/format-netspoc/format-netspoc.t

@@ -231,7 +231,7 @@ host:h2, # after second
 group:g1 =
  # g1 trailing2
  # g1 post def
- description = This is a fine group # desc
+ description = This is a fine group;      # desc
 
  # desc post
  # desc post 2
@@ -253,7 +253,7 @@ group:g1 =
 ;
 =OUTPUT=
 group:g1 =
- description = the text # comment
+ description = the text; ;; # comment
 
 ;
 =END=