summary refs log tree commit diff stats
path: root/commands
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-05-18 15:34:16 -0400
committerDrew DeVault <sir@cmpwn.com>2019-05-18 15:34:16 -0400
commitca2cd00fe75863002145afcbfad1fe03f6258cfc (patch)
tree6699de430d93fddf3a682f838af0f4c81c1dcaba /commands
parentb8208509f47301bcb03bc222f5e5765833478250 (diff)
downloadaerc-ca2cd00fe75863002145afcbfad1fe03f6258cfc.tar.gz
Fix scdoc & gofmt issues
Diffstat (limited to 'commands')
-rw-r--r--commands/account/compose.go2
-rw-r--r--commands/account/reply.go16
-rw-r--r--commands/account/view-message.go1
-rw-r--r--commands/compose/send.go8
-rw-r--r--commands/msgview/close.go1
5 files changed, 11 insertions, 17 deletions
diff --git a/commands/account/compose.go b/commands/account/compose.go
index d77689e..aeb415e 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -29,5 +29,3 @@ func Compose(aerc *widgets.Aerc, args []string) error {
 	})
 	return nil
 }
-
-
diff --git a/commands/account/reply.go b/commands/account/reply.go
index e5b7679..f55d448 100644
--- a/commands/account/reply.go
+++ b/commands/account/reply.go
@@ -8,11 +8,11 @@ import (
 	gomail "net/mail"
 	"strings"
 
+	"git.sr.ht/~sircmpwn/getopt"
+	"github.com/emersion/go-imap"
 	"github.com/emersion/go-message"
 	_ "github.com/emersion/go-message/charset"
 	"github.com/emersion/go-message/mail"
-	"github.com/emersion/go-imap"
-	"git.sr.ht/~sircmpwn/getopt"
 
 	"git.sr.ht/~sircmpwn/aerc/widgets"
 )
@@ -26,7 +26,7 @@ func Reply(aerc *widgets.Aerc, args []string) error {
 	if err != nil {
 		return err
 	}
-	if optind != len(args) - 1 {
+	if optind != len(args)-1 {
 		return errors.New("Usage: reply [-aq]")
 	}
 	var (
@@ -103,9 +103,9 @@ func Reply(aerc *widgets.Aerc, args []string) error {
 	composer := widgets.NewComposer(
 		aerc.Config(), acct.AccountConfig(), acct.Worker()).
 		Defaults(map[string]string{
-			"To": strings.Join(to, ","),
-			"Cc": strings.Join(cc, ","),
-			"Subject": subject,
+			"To":          strings.Join(to, ","),
+			"Cc":          strings.Join(cc, ","),
+			"Subject":     subject,
 			"In-Reply-To": msg.Envelope.MessageId,
 		}).
 		FocusTerminal()
@@ -153,7 +153,7 @@ func Reply(aerc *widgets.Aerc, args []string) error {
 				msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"),
 				msg.Envelope.From[0].PersonalName))
 			for scanner.Scan() {
-				io.WriteString(pipein, fmt.Sprintf("> %s\n",scanner.Text()))
+				io.WriteString(pipein, fmt.Sprintf("> %s\n", scanner.Text()))
 			}
 			pipein.Close()
 			pipeout.Close()
@@ -165,5 +165,3 @@ func Reply(aerc *widgets.Aerc, args []string) error {
 
 	return nil
 }
-
-
diff --git a/commands/account/view-message.go b/commands/account/view-message.go
index cf2baaa..4db5c95 100644
--- a/commands/account/view-message.go
+++ b/commands/account/view-message.go
@@ -27,4 +27,3 @@ func ViewMessage(aerc *widgets.Aerc, args []string) error {
 	aerc.NewTab(viewer, msg.Envelope.Subject)
 	return nil
 }
-
diff --git a/commands/compose/send.go b/commands/compose/send.go
index 51ae4ce..02fc272 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -174,10 +174,10 @@ func SendMessage(aerc *widgets.Aerc, args []string) error {
 			r, w := io.Pipe()
 			worker.PostAction(&types.AppendMessage{
 				Destination: config.CopyTo,
-				Flags: []string{},
-				Date: time.Now(),
-				Reader: r,
-				Length: nbytes,
+				Flags:       []string{},
+				Date:        time.Now(),
+				Reader:      r,
+				Length:      nbytes,
 			}, func(msg types.WorkerMessage) {
 				switch msg := msg.(type) {
 				case *types.Done:
diff --git a/commands/msgview/close.go b/commands/msgview/close.go
index e388f65..4ce15c4 100644
--- a/commands/msgview/close.go
+++ b/commands/msgview/close.go
@@ -18,4 +18,3 @@ func CommandClose(aerc *widgets.Aerc, args []string) error {
 	aerc.RemoveTab(mv)
 	return nil
 }
-
mmitter Kartik K. Agaram <vc@akkartik.com> 2015-11-04 23:54:14 -0800 2362' href='/akkartik/mu/commit/055parse_tree.cc?h=hlt&id=9cfd925aa408d32197cfba6ef870f3f45cc6309a'>9cfd925a ^
1ead3562 ^
15f79a66 ^
6808ff7d ^
15f79a66 ^




acc4792d ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71




                                                                              
                 
                                                
          

                                               
                                                               


                                               

                                                    
















                                                    
                                      
                                 




                         

                                                         

                        


                               
                         
                                
                                        




                                            
   

                        
 

                                          
                                                 
          
                                                              
 




                      
                                                                                
// So far instructions can only contain linear lists of properties. Now we add
// support for more complex trees of properties in dilated reagents. This will
// come in handy later for expressing complex types, like "a dictionary from
// (address to array of charaters) to (list of numbers)".

:(scenarios load)
:(scenario dilated_reagent_with_nested_brackets)
def main [
  {1: number, foo: (bar (baz quux))} <- copy 34
]
+parse:   product: {1: "number", "foo": ("bar" ("baz" "quux"))}

:(before "End Parsing Reagent Property(value)")
value = parse_string_tree(value);
:(before "End Parsing Reagent Type Property(value)")
value = parse_string_tree(value);

:(code)
string_tree* parse_string_tree(string_tree* s) {
  assert(!s->left && !s->right);
  if (s->value.at(0) != '(') return s;
  string_tree* result = parse_string_tree(s->value);
  delete s;
  return result;
}

string_tree* parse_string_tree(const string& s) {
  istringstream in(s);
  in >> std::noskipws;
  return parse_string_tree(in);
}

string_tree* parse_string_tree(istream& in) {
  skip_whitespace_but_not_newline(in);
  if (!has_data(in)) return NULL;
  if (in.peek() == ')') {
    in.get();
    return NULL;
  }
  if (in.peek() != '(') {
    string_tree* result = new string_tree(next_word(in));
    return result;
  }
  in.get();  // skip '('
  string_tree* result = NULL;
  string_tree** curr = &result;
  while (in.peek() != ')') {
    assert(has_data(in));
    *curr = new string_tree("");
    skip_whitespace_but_not_newline(in);
    if (in.peek() == '(')
      (*curr)->left = parse_string_tree(in);
    else
      (*curr)->value = next_word(in);
    curr = &(*curr)->right;
  }
  in.get();  // skip ')'
  return result;
}

:(scenario dilated_reagent_with_type_tree)
% Hide_errors = true;  // 'map' isn't defined yet
def main [
  {1: (foo (address array character) (bar number))} <- copy 34
]
# just to avoid errors
container foo [
]
container bar [
]
+parse:   product: {1: ("foo" ("address" "array" "character") ("bar" "number"))}