add some more cases to Ast.s_expr